From a38816471bbea8740b30d693ca1f2cca425ec964 Mon Sep 17 00:00:00 2001 From: James Sturtevant Date: Tue, 4 May 2021 16:41:04 -0700 Subject: [PATCH] Ensure kubelet restarts --- templates/cluster-template-machinepool-windows.yaml | 2 ++ templates/cluster-template-windows.yaml | 2 ++ .../machinepool-windows/machine-pool-deployment-windows.yaml | 2 ++ templates/flavors/windows/machine-deployment-windows.yaml | 2 ++ .../test/ci/cluster-template-prow-machine-pool-windows.yaml | 2 ++ templates/test/ci/cluster-template-prow-windows.yaml | 2 ++ 6 files changed, 12 insertions(+) diff --git a/templates/cluster-template-machinepool-windows.yaml b/templates/cluster-template-machinepool-windows.yaml index b9bd23f05e7..7753212782d 100644 --- 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 index 15d977a8c6f..2bb8bc64cc7 100644 --- 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 index e5d102ce391..4c0acf67470 100644 --- 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 index ff6e1c5f20f..fd6b800b7c0 100644 --- 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 index 1c40bc7f67b..90943900aad 100644 --- 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 index 569ae4081b7..475dcb08331 100644 --- 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: