ci: fixing issue where WINDOWS_SERVER_VERSION does not work for cluster-template-prow-ci-version templates

[marosset]

Signed-off-by: Mark Rossetti [email protected]

What type of PR is this?
/kind bug

What this PR does / why we need it:

Recently several CI jobs that test Windows Server 2022 were switched from using KUBERNETES_VERSION=v1.23.5 to KUBERNETES_VERSION=latest-1.23 which caused the cluster template to switch from cluster-template-prow.yaml to `cluster-template-prow-ci-version.yaml.

cluster-template-prow-ci-version.yaml has a hard-coded image which caused the defaulting logic that uses WINDOWS_SERVER_VERSION to not run.

This change allows cluster-template-prow-ci-version.yaml templates to provision either Windows Server 2019 or Windows Server 2022 machines if WINDOWS_SERVER_VERSION is set.

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:

none

[marosset]

/assign @jackfrancis @jsturtevant
/cc @edreed

We'll want to cherry-pick this to release-1.23 branch too.

I have manually verified that the correct images are selected for windows nodes.

[marosset]

/test ?

[k8s-ci-robot]

@marosset: The following commands are available to trigger required jobs:

• /test pull-cluster-api-provider-azure-build
• /test pull-cluster-api-provider-azure-e2e
• /test pull-cluster-api-provider-azure-test
• /test pull-cluster-api-provider-azure-verify

The following commands are available to trigger optional jobs:

• /test pull-cluster-api-provider-azure-apidiff
• /test pull-cluster-api-provider-azure-apiversion-upgrade
• /test pull-cluster-api-provider-azure-capi-e2e
• /test pull-cluster-api-provider-azure-ci-entrypoint
• /test pull-cluster-api-provider-azure-conformance
• /test pull-cluster-api-provider-azure-conformance-with-ci-artifacts
• /test pull-cluster-api-provider-azure-coverage
• /test pull-cluster-api-provider-azure-e2e-exp
• /test pull-cluster-api-provider-azure-e2e-optional
• /test pull-cluster-api-provider-azure-e2e-workload-upgrade
• /test pull-cluster-api-provider-azure-windows-containerd-upstream-with-ci-artifacts
• /test pull-cluster-api-provider-azure-windows-containerd-upstream-with-ci-artifacts-serial-slow

Use /test all to run the following jobs that were automatically triggered:

• pull-cluster-api-provider-azure-apidiff
• pull-cluster-api-provider-azure-build
• pull-cluster-api-provider-azure-ci-entrypoint
• pull-cluster-api-provider-azure-coverage
• pull-cluster-api-provider-azure-e2e
• pull-cluster-api-provider-azure-test
• pull-cluster-api-provider-azure-verify

In response to this:

/test ?

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]

/test pull-cluster-api-provider-azure-ci-entrypoint
/test pull-cluster-api-provider-azure-windows-containerd-upstream-with-ci-artifacts

[edreed]

/lgtm

[jackfrancis]

/lgtm

[k8s-ci-robot]

@marosset: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
pull-cluster-api-provider-azure-windows-containerd-upstream-with-ci-artifacts	2849dc3	link	false	/test pull-cluster-api-provider-azure-windows-containerd-upstream-with-ci-artifacts

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

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. I understand the commands that are listed here.

[marosset]

the faillures in pull-cluster-api-provider-azure-windows-containerd-upstream-with-ci-artifacts are known and related to runAsUser being set

[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

[marosset]

/cherry-pick release-1.3

[k8s-infra-cherrypick-robot]

@marosset: new pull request created: #2352

In response to this:

/cherry-pick release-1.3

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.