Skip to content

Commit 5878815

Browse files
authored
Merge pull request #3319 from marosset/windows-azuremachine-pool-updates-release-1-7
[Release-1.7] AzureMachinePool windows template fixes
2 parents 0dacd65 + 51c875e commit 5878815

File tree

5 files changed

+15
-10
lines changed

5 files changed

+15
-10
lines changed

templates/cluster-template-machinepool-windows.yaml

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

templates/flavors/machinepool-windows/machine-pool-deployment-windows.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,14 @@ metadata:
2626
name: "${CLUSTER_NAME}-mp-win"
2727
annotations:
2828
runtime: containerd
29+
windowsServerVersion: ${WINDOWS_SERVER_VERSION:=""}
2930
spec:
3031
location: ${AZURE_LOCATION}
3132
template:
3233
vmSize: ${AZURE_NODE_MACHINE_TYPE}
3334
osDisk:
3435
osType: "Windows"
35-
diskSizeGB: 30
36+
diskSizeGB: 128
3637
managedDisk:
3738
storageAccountType: "Premium_LRS"
3839
sshPublicKey: ${AZURE_SSH_PUBLIC_KEY_B64:=""}
@@ -60,7 +61,7 @@ spec:
6061
cloud-provider: azure
6162
cloud-config: 'c:/k/azure.json'
6263
azure-container-registry-config: 'c:/k/azure.json'
63-
pod-infra-container-image: "mcr.microsoft.com/oss/kubernetes/pause:3.4.1"
64+
pod-infra-container-image: "mcr.microsoft.com/oss/kubernetes/pause:3.9"
6465
feature-gates: "WindowsHostProcessContainers=true"
6566
files:
6667
- contentFrom:

templates/test/ci/cluster-template-prow-machine-pool-ci-version.yaml

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

templates/test/ci/cluster-template-prow-machine-pool.yaml

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

templates/test/dev/cluster-template-custom-builds-machine-pool.yaml

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)