AzureMachinePool windows template fixes

[marosset]

What type of PR is this?
/kind feature

What this PR does / why we need it:
AzureMachinePool windows fixes to

• to set disk size to 128gb
• honor WINDOWS_SERVER_VERSION
• use newer pause image

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #

Special notes for your reviewer:

Please confirm that if this PR changes any image versions, then that's the sole change this PR makes.

TODOs:

• squashed commits
• includes documentation
• adds unit tests

Release note:

Fixes for AzureMachinePool running Windows

[marosset]

/assign @jsturtevant @nojnhuh

[nojnhuh]

/lgtm

[k8s-ci-robot]

LGTM label has been added.

Git tree hash: 149cb87b2f371563ca5636e156ef1225641be9ab

[CecileRobertMichon]

/approve

[k8s-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: CecileRobertMichon

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

• OWNERS [CecileRobertMichon]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[CecileRobertMichon]

@marosset should we cherry-pick this as well?

[marosset]

/cherry-pick release-1.8

[k8s-infra-cherrypick-robot]

@marosset: once the present PR merges, I will cherry-pick it on top of release-1.8 in a new PR and assign it to you.

In response to this:

/cherry-pick release-1.8

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[marosset]

Do we want this in 1.7 too or just 1.8?

[CecileRobertMichon]

both since both have active PR tests for cherry-picks, if this fixes stuff

although you'll probably have to do a manual cherry-pick for 1.7 since there will likely be some yaml conflicts

but worth trying

/cherry-pick release-1.7

[k8s-infra-cherrypick-robot]

@CecileRobertMichon: once the present PR merges, I will cherry-pick it on top of release-1.7 in a new PR and assign it to you.

In response to this:

both since both have active PR tests for cherry-picks, if this fixes stuff

although you'll probably have to do a manual cherry-pick for 1.7 since there will likely be some yaml conflicts

but worth trying

/cherry-pick release-1.7

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[k8s-infra-cherrypick-robot]

@marosset: new pull request created: #3317

In response to this:

/cherry-pick release-1.8

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[k8s-infra-cherrypick-robot]

@CecileRobertMichon: #3311 failed to apply on top of branch "release-1.7":

Applying: AzureMachinePool windows fixes to set size to 128gb, honor WINDOWS_SERVER_VERSION, and use newer pause image
Using index info to reconstruct a base tree...
M	templates/cluster-template-machinepool-windows.yaml
M	templates/flavors/machinepool-windows/machine-pool-deployment-windows.yaml
A	templates/test/ci/cluster-template-prow-intree-cloud-provider-machine-pool.yaml
M	templates/test/ci/cluster-template-prow-machine-pool-ci-version.yaml
A	templates/test/ci/cluster-template-prow-machine-pool-flex.yaml
M	templates/test/ci/cluster-template-prow-machine-pool.yaml
M	templates/test/dev/cluster-template-custom-builds-machine-pool.yaml
Falling back to patching base and 3-way merge...
Auto-merging templates/test/dev/cluster-template-custom-builds.yaml
CONFLICT (content): Merge conflict in templates/test/dev/cluster-template-custom-builds.yaml
Auto-merging templates/test/dev/cluster-template-custom-builds-machine-pool.yaml
Auto-merging templates/test/ci/cluster-template-prow.yaml
CONFLICT (content): Merge conflict in templates/test/ci/cluster-template-prow.yaml
Auto-merging templates/test/ci/cluster-template-prow-machine-pool.yaml
Auto-merging templates/test/ci/cluster-template-prow-machine-pool-ci-version.yaml
Auto-merging templates/flavors/machinepool-windows/machine-pool-deployment-windows.yaml
CONFLICT (content): Merge conflict in templates/flavors/machinepool-windows/machine-pool-deployment-windows.yaml
Auto-merging templates/cluster-template-machinepool-windows.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 AzureMachinePool windows fixes to set size to 128gb, honor WINDOWS_SERVER_VERSION, and use newer pause image
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

both since both have active PR tests for cherry-picks, if this fixes stuff

although you'll probably have to do a manual cherry-pick for 1.7 since there will likely be some yaml conflicts

but worth trying

/cherry-pick release-1.7

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[marosset]

I'll manually cherry-pick into 1.7