health-monitor script doesn’t require docker (#4028)

parts/k8s/kubernetesagentcustomdata.yml

@@ -36,6 +36,43 @@ write_files:
   content: !!binary |
     {{WrapAsVariable "provisionConfigs"}}
 
+- path: "/usr/local/bin/health-monitor.sh"
+  permissions: "0544"
+  encoding: gzip
+  owner: "root"
+  content: !!binary |
+    {{WrapAsVariable "healthMonitorScript"}}
+
+- path: "/etc/systemd/system/kubelet-monitor.service"
+  permissions: "0644"
+  owner: "root"
+  content: |
+    [Unit]
+    Description=a script that checks kubelet health and restarts if needed
+    After=kubelet.service
+    [Service]
+    Restart=always
+    RestartSec=10
+    RemainAfterExit=yes
+    ExecStart=/usr/local/bin/health-monitor.sh kubelet
+    [Install]
+    WantedBy=multi-user.target
+
+- path: "/etc/systemd/system/docker-monitor.service"
+  permissions: "0644"
+  owner: "root"
+  content: |
+    [Unit]
+    Description=a script that checks docker health and restarts if needed
+    After=docker.service
+    [Service]
+    Restart=always
+    RestartSec=10
+    RemainAfterExit=yes
+    ExecStart=/usr/local/bin/health-monitor.sh container-runtime
+    [Install]
+    WantedBy=multi-user.target
+
 {{if .KubernetesConfig.RequiresDocker}}
     {{if not .IsCoreOS}}
 - path: "/etc/systemd/system/docker.service.d/clear_mount_propagation_flags.conf"
@@ -72,43 +109,6 @@ write_files:
         }
       }{{end}}{{end}}
     }
-
-- path: "/usr/local/bin/health-monitor.sh"
-  permissions: "0544"
-  encoding: gzip
-  owner: "root"
-  content: !!binary |
-    {{WrapAsVariable "healthMonitorScript"}}
-
-- path: "/etc/systemd/system/docker-monitor.service"
-  permissions: "0644"
-  owner: "root"
-  content: |
-    [Unit]
-    Description=a script that checks docker health and restarts if needed
-    After=docker.service
-    [Service]
-    Restart=always
-    RestartSec=10
-    RemainAfterExit=yes
-    ExecStart=/usr/local/bin/health-monitor.sh container-runtime
-    [Install]
-    WantedBy=multi-user.target
-
-- path: "/etc/systemd/system/kubelet-monitor.service"
-  permissions: "0644"
-  owner: "root"
-  content: |
-    [Unit]
-    Description=a script that checks kubelet health and restarts if needed
-    After=kubelet.service
-    [Service]
-    Restart=always
-    RestartSec=10
-    RemainAfterExit=yes
-    ExecStart=/usr/local/bin/health-monitor.sh kubelet
-    [Install]
-    WantedBy=multi-user.target
 {{end}}
 
 {{if IsNSeriesSKU .}}

parts/k8s/kubernetesmastercustomdata.yml

@@ -42,6 +42,43 @@ write_files:
   content: !!binary |
     {{WrapAsVariable "provisionConfigs"}}
 
+- path: "/usr/local/bin/health-monitor.sh"
+  permissions: "0544"
+  encoding: gzip
+  owner: "root"
+  content: !!binary |
+    {{WrapAsVariable "healthMonitorScript"}}
+
+- path: "/etc/systemd/system/kubelet-monitor.service"
+  permissions: "0644"
+  owner: "root"
+  content: |
+    [Unit]
+    Description=a script that checks kubelet health and restarts if needed
+    After=kubelet.service
+    [Service]
+    Restart=always
+    RestartSec=10
+    RemainAfterExit=yes
+    ExecStart=/usr/local/bin/health-monitor.sh kubelet
+    [Install]
+    WantedBy=multi-user.target
+
+- path: "/etc/systemd/system/docker-monitor.service"
+  permissions: "0644"
+  owner: "root"
+  content: |
+    [Unit]
+    Description=a script that checks docker health and restarts if needed
+    After=docker.service
+    [Service]
+    Restart=always
+    RestartSec=10
+    RemainAfterExit=yes
+    ExecStart=/usr/local/bin/health-monitor.sh container-runtime
+    [Install]
+    WantedBy=multi-user.target
+
 {{if .OrchestratorProfile.KubernetesConfig.RequiresDocker}}
     {{if not .MasterProfile.IsCoreOS}}
 - path: "/etc/systemd/system/docker.service.d/clear_mount_propagation_flags.conf"
@@ -75,43 +112,6 @@ write_files:
          "max-file": "5"
       }
     }
-
-- path: "/usr/local/bin/health-monitor.sh"
-  permissions: "0544"
-  encoding: gzip
-  owner: "root"
-  content: !!binary |
-    {{WrapAsVariable "healthMonitorScript"}}
-
-- path: "/etc/systemd/system/docker-monitor.service"
-  permissions: "0644"
-  owner: "root"
-  content: |
-    [Unit]
-    Description=a script that checks docker health and restarts if needed
-    After=docker.service
-    [Service]
-    Restart=always
-    RestartSec=10
-    RemainAfterExit=yes
-    ExecStart=/usr/local/bin/health-monitor.sh container-runtime
-    [Install]
-    WantedBy=multi-user.target
-
-- path: "/etc/systemd/system/kubelet-monitor.service"
-  permissions: "0644"
-  owner: "root"
-  content: |
-    [Unit]
-    Description=a script that checks kubelet health and restarts if needed
-    After=kubelet.service
-    [Service]
-    Restart=always
-    RestartSec=10
-    RemainAfterExit=yes
-    ExecStart=/usr/local/bin/health-monitor.sh kubelet
-    [Install]
-    WantedBy=multi-user.target
 {{end}}
 
 - path: "/etc/kubernetes/certs/ca.crt"

parts/k8s/kubernetesmastercustomdatavmss.yml

@@ -42,6 +42,43 @@ write_files:
   content: !!binary |
     {{WrapAsVariable "provisionConfigs"}}
 
+- path: "/usr/local/bin/health-monitor.sh"
+  permissions: "0544"
+  encoding: gzip
+  owner: "root"
+  content: !!binary |
+    {{WrapAsVariable "healthMonitorScript"}}
+
+- path: "/etc/systemd/system/kubelet-monitor.service"
+  permissions: "0644"
+  owner: "root"
+  content: |
+    [Unit]
+    Description=a script that checks kubelet health and restarts if needed
+    After=kubelet.service
+    [Service]
+    Restart=always
+    RestartSec=10
+    RemainAfterExit=yes
+    ExecStart=/usr/local/bin/health-monitor.sh kubelet
+    [Install]
+    WantedBy=multi-user.target
+
+- path: "/etc/systemd/system/docker-monitor.service"
+  permissions: "0644"
+  owner: "root"
+  content: |
+    [Unit]
+    Description=a script that checks docker health and restarts if needed
+    After=docker.service
+    [Service]
+    Restart=always
+    RestartSec=10
+    RemainAfterExit=yes
+    ExecStart=/usr/local/bin/health-monitor.sh container-runtime
+    [Install]
+    WantedBy=multi-user.target
+
 {{if .OrchestratorProfile.KubernetesConfig.RequiresDocker}}
     {{if not .MasterProfile.IsCoreOS}}
 - path: "/etc/systemd/system/docker.service.d/clear_mount_propagation_flags.conf"
@@ -75,43 +112,6 @@ write_files:
          "max-file": "5"
       }
     }
-
-- path: "/usr/local/bin/health-monitor.sh"
-  permissions: "0544"
-  encoding: gzip
-  owner: "root"
-  content: !!binary |
-    {{WrapAsVariable "healthMonitorScript"}}
-
-- path: "/etc/systemd/system/docker-monitor.service"
-  permissions: "0644"
-  owner: "root"
-  content: |
-    [Unit]
-    Description=a script that checks docker health and restarts if needed
-    After=docker.service
-    [Service]
-    Restart=always
-    RestartSec=10
-    RemainAfterExit=yes
-    ExecStart=/usr/local/bin/health-monitor.sh container-runtime
-    [Install]
-    WantedBy=multi-user.target
-
-- path: "/etc/systemd/system/kubelet-monitor.service"
-  permissions: "0644"
-  owner: "root"
-  content: |
-    [Unit]
-    Description=a script that checks kubelet health and restarts if needed
-    After=kubelet.service
-    [Service]
-    Restart=always
-    RestartSec=10
-    RemainAfterExit=yes
-    ExecStart=/usr/local/bin/health-monitor.sh kubelet
-    [Install]
-    WantedBy=multi-user.target
 {{end}}
 
 - path: "/etc/kubernetes/certs/ca.crt"