Merge pull request #3311 from marosset/azure-machine-pool-windows-fixes

AzureMachinePool windows template fixes
kubernetes-sigs · Mar 16, 2023 · cf41a74 · cf41a74
1 parent 3ae0398
commit cf41a74
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 10 deletions.
diff --git a/templates/cluster-template-machinepool-windows.yaml b/templates/cluster-template-machinepool-windows.yaml
diff --git 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
diff --git a/templates/test/ci/cluster-template-prow-machine-pool.yaml b/templates/test/ci/cluster-template-prow-machine-pool.yaml
diff --git a/templates/test/dev/cluster-template-custom-builds-machine-pool.yaml b/templates/test/dev/cluster-template-custom-builds-machine-pool.yaml