From cf41a7481eda46124e2fcde4eceeb9178f4d1682 Mon Sep 17 00:00:00 2001 From: Kubernetes Prow Robot Date: Thu, 16 Mar 2023 14:35:31 -0700 Subject: [PATCH] Merge pull request #3311 from marosset/azure-machine-pool-windows-fixes AzureMachinePool windows template fixes --- templates/cluster-template-machinepool-windows.yaml | 5 +++-- .../machinepool-windows/machine-pool-deployment-windows.yaml | 5 +++-- .../ci/cluster-template-prow-machine-pool-ci-version.yaml | 5 +++-- templates/test/ci/cluster-template-prow-machine-pool.yaml | 5 +++-- .../dev/cluster-template-custom-builds-machine-pool.yaml | 5 +++-- 5 files changed, 15 insertions(+), 10 deletions(-) diff --git a/templates/cluster-template-machinepool-windows.yaml b/templates/cluster-template-machinepool-windows.yaml index 3b028348fa3..961e74d4084 100644 --- a/templates/cluster-template-machinepool-windows.yaml +++ b/templates/cluster-template-machinepool-windows.yaml @@ -259,13 +259,14 @@ kind: AzureMachinePool metadata: annotations: runtime: containerd + windowsServerVersion: ${WINDOWS_SERVER_VERSION:=""} name: ${CLUSTER_NAME}-mp-win namespace: default spec: location: ${AZURE_LOCATION} template: osDisk: - diskSizeGB: 30 + diskSizeGB: 128 managedDisk: storageAccountType: Premium_LRS osType: Windows @@ -297,7 +298,7 @@ spec: cloud-config: c:/k/azure.json cloud-provider: azure feature-gates: WindowsHostProcessContainers=true - pod-infra-container-image: mcr.microsoft.com/oss/kubernetes/pause:3.4.1 + pod-infra-container-image: mcr.microsoft.com/oss/kubernetes/pause:3.9 name: '{{ ds.meta_data["local_hostname"] }}' postKubeadmCommands: - nssm set kubelet start SERVICE_AUTO_START diff --git a/templates/flavors/machinepool-windows/machine-pool-deployment-windows.yaml b/templates/flavors/machinepool-windows/machine-pool-deployment-windows.yaml index 7f90b786d32..a588d63ea0e 100644 --- a/templates/flavors/machinepool-windows/machine-pool-deployment-windows.yaml +++ b/templates/flavors/machinepool-windows/machine-pool-deployment-windows.yaml @@ -26,13 +26,14 @@ metadata: name: "${CLUSTER_NAME}-mp-win" annotations: runtime: containerd + windowsServerVersion: ${WINDOWS_SERVER_VERSION:=""} spec: location: ${AZURE_LOCATION} template: vmSize: ${AZURE_NODE_MACHINE_TYPE} osDisk: osType: "Windows" - diskSizeGB: 30 + diskSizeGB: 128 managedDisk: storageAccountType: "Premium_LRS" sshPublicKey: ${AZURE_SSH_PUBLIC_KEY_B64:=""} @@ -60,7 +61,7 @@ spec: cloud-provider: azure cloud-config: 'c:/k/azure.json' azure-container-registry-config: 'c:/k/azure.json' - pod-infra-container-image: "mcr.microsoft.com/oss/kubernetes/pause:3.4.1" + pod-infra-container-image: "mcr.microsoft.com/oss/kubernetes/pause:3.9" feature-gates: "WindowsHostProcessContainers=true" files: - contentFrom: diff --git a/templates/test/ci/cluster-template-prow-machine-pool-ci-version.yaml b/templates/test/ci/cluster-template-prow-machine-pool-ci-version.yaml index d07a1c7f25a..6ed07a8430e 100644 --- a/templates/test/ci/cluster-template-prow-machine-pool-ci-version.yaml +++ b/templates/test/ci/cluster-template-prow-machine-pool-ci-version.yaml @@ -420,6 +420,7 @@ kind: AzureMachinePool metadata: annotations: runtime: containerd + windowsServerVersion: ${WINDOWS_SERVER_VERSION:=""} name: ${CLUSTER_NAME}-mp-win namespace: default spec: @@ -432,7 +433,7 @@ spec: sku: ${WINDOWS_SERVER_VERSION:=windows-2019}-containerd-gen1 version: latest osDisk: - diskSizeGB: 30 + diskSizeGB: 128 managedDisk: storageAccountType: Premium_LRS osType: Windows @@ -491,7 +492,7 @@ spec: cloud-config: c:/k/azure.json cloud-provider: azure feature-gates: WindowsHostProcessContainers=true - pod-infra-container-image: mcr.microsoft.com/oss/kubernetes/pause:3.4.1 + pod-infra-container-image: mcr.microsoft.com/oss/kubernetes/pause:3.9 name: '{{ ds.meta_data["local_hostname"] }}' postKubeadmCommands: - nssm set kubelet start SERVICE_AUTO_START diff --git a/templates/test/ci/cluster-template-prow-machine-pool.yaml b/templates/test/ci/cluster-template-prow-machine-pool.yaml index ba94098eb3d..c34e8846e92 100644 --- a/templates/test/ci/cluster-template-prow-machine-pool.yaml +++ b/templates/test/ci/cluster-template-prow-machine-pool.yaml @@ -274,13 +274,14 @@ kind: AzureMachinePool metadata: annotations: runtime: containerd + windowsServerVersion: ${WINDOWS_SERVER_VERSION:=""} name: ${CLUSTER_NAME}-mp-win namespace: default spec: location: ${AZURE_LOCATION} template: osDisk: - diskSizeGB: 30 + diskSizeGB: 128 managedDisk: storageAccountType: Premium_LRS osType: Windows @@ -312,7 +313,7 @@ spec: cloud-config: c:/k/azure.json cloud-provider: azure feature-gates: WindowsHostProcessContainers=true - pod-infra-container-image: mcr.microsoft.com/oss/kubernetes/pause:3.4.1 + pod-infra-container-image: mcr.microsoft.com/oss/kubernetes/pause:3.9 name: '{{ ds.meta_data["local_hostname"] }}' postKubeadmCommands: - nssm set kubelet start SERVICE_AUTO_START diff --git a/templates/test/dev/cluster-template-custom-builds-machine-pool.yaml b/templates/test/dev/cluster-template-custom-builds-machine-pool.yaml index 02836957e19..a1023ffffff 100644 --- a/templates/test/dev/cluster-template-custom-builds-machine-pool.yaml +++ b/templates/test/dev/cluster-template-custom-builds-machine-pool.yaml @@ -367,13 +367,14 @@ kind: AzureMachinePool metadata: annotations: runtime: containerd + windowsServerVersion: ${WINDOWS_SERVER_VERSION:=""} name: ${CLUSTER_NAME}-mp-win namespace: default spec: location: ${AZURE_LOCATION} template: osDisk: - diskSizeGB: 30 + diskSizeGB: 128 managedDisk: storageAccountType: Premium_LRS osType: Windows @@ -405,7 +406,7 @@ spec: cloud-config: c:/k/azure.json cloud-provider: azure feature-gates: WindowsHostProcessContainers=true - pod-infra-container-image: mcr.microsoft.com/oss/kubernetes/pause:3.4.1 + pod-infra-container-image: mcr.microsoft.com/oss/kubernetes/pause:3.9 name: '{{ ds.meta_data["local_hostname"] }}' postKubeadmCommands: - nssm set kubelet start SERVICE_AUTO_START