Merge pull request #1366 from jsturtevant/fix-1328

Ensure kubelet restarts
kubernetes-sigs · May 5, 2021 · 6156c33 · 6156c33
2 parents 660a35f + a388164
commit 6156c33
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 0 deletions.
diff --git a/templates/cluster-template-machinepool-windows.yaml b/templates/cluster-template-machinepool-windows.yaml
@@ -289,6 +289,8 @@ spec:
         cloud-provider: azure
         pod-infra-container-image: mcr.microsoft.com/oss/kubernetes/pause:1.4.1
       name: '{{ ds.meta_data["local_hostname"] }}'
+  postKubeadmCommands:
+  - nssm set kubelet start SERVICE_AUTO_START
   preKubeadmCommands:
   - powershell c:/create-external-network.ps1
   users:

diff --git a/templates/cluster-template-windows.yaml b/templates/cluster-template-windows.yaml
@@ -297,6 +297,8 @@ spec:
             cloud-provider: azure
             pod-infra-container-image: mcr.microsoft.com/oss/kubernetes/pause:1.4.1
           name: '{{ ds.meta_data["local_hostname"] }}'
+      postKubeadmCommands:
+      - nssm set kubelet start SERVICE_AUTO_START
       preKubeadmCommands:
       - powershell c:/create-external-network.ps1
       users:

diff --git a/templates/flavors/machinepool-windows/machine-pool-deployment-windows.yaml b/templates/flavors/machinepool-windows/machine-pool-deployment-windows.yaml
@@ -47,6 +47,8 @@ spec:
     - ${AZURE_SSH_PUBLIC_KEY:=""}
   preKubeadmCommands:
     - powershell c:/create-external-network.ps1
+  postKubeadmCommands:
+    - nssm set kubelet start SERVICE_AUTO_START
   joinConfiguration:
     nodeRegistration:
       name: '{{ ds.meta_data["local_hostname"] }}'

diff --git a/templates/flavors/windows/machine-deployment-windows.yaml b/templates/flavors/windows/machine-deployment-windows.yaml
@@ -51,6 +51,8 @@ spec:
         - ${AZURE_SSH_PUBLIC_KEY:=""}
       preKubeadmCommands:
         - powershell c:/create-external-network.ps1
+      postKubeadmCommands:
+        - nssm set kubelet start SERVICE_AUTO_START
       joinConfiguration:
         nodeRegistration:
           name: '{{ ds.meta_data["local_hostname"] }}'

diff --git a/templates/test/ci/cluster-template-prow-machine-pool-windows.yaml b/templates/test/ci/cluster-template-prow-machine-pool-windows.yaml
@@ -294,6 +294,8 @@ spec:
         cloud-provider: azure
         pod-infra-container-image: mcr.microsoft.com/oss/kubernetes/pause:1.4.1
       name: '{{ ds.meta_data["local_hostname"] }}'
+  postKubeadmCommands:
+  - nssm set kubelet start SERVICE_AUTO_START
   preKubeadmCommands:
   - powershell c:/create-external-network.ps1
   users:

diff --git a/templates/test/ci/cluster-template-prow-windows.yaml b/templates/test/ci/cluster-template-prow-windows.yaml
@@ -302,6 +302,8 @@ spec:
             cloud-provider: azure
             pod-infra-container-image: mcr.microsoft.com/oss/kubernetes/pause:1.4.1
           name: '{{ ds.meta_data["local_hostname"] }}'
+      postKubeadmCommands:
+      - nssm set kubelet start SERVICE_AUTO_START
       preKubeadmCommands:
       - powershell c:/create-external-network.ps1
       users: