From 2849dc3a1e23bcdd260011564b5e86cd7d32a0b1 Mon Sep 17 00:00:00 2001 From: Mark Rossetti Date: Thu, 2 Jun 2022 15:00:07 -0700 Subject: [PATCH] ci: fixing issue where WINDOWS_SERVER_VERSION does not work for cluster-template-prow-ci-version templates Signed-off-by: Mark Rossetti --- scripts/ci-entrypoint.sh | 2 ++ templates/test/ci/cluster-template-prow-ci-version.yaml | 2 +- ...luster-template-prow-external-cloud-provider-ci-version.yaml | 2 +- .../patches/machine-deployment-ci-version-windows.yaml | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/scripts/ci-entrypoint.sh b/scripts/ci-entrypoint.sh index 1ac219a9746..faa615fb79f 100755 --- a/scripts/ci-entrypoint.sh +++ b/scripts/ci-entrypoint.sh @@ -111,6 +111,8 @@ select_cluster_template() { export CLUSTER_TEMPLATE="${CLUSTER_TEMPLATE/custom-builds/custom-builds-machine-pool}" fi fi + + echo "Using cluster template: ${CLUSTER_TEMPLATE}" } create_cluster() { diff --git a/templates/test/ci/cluster-template-prow-ci-version.yaml b/templates/test/ci/cluster-template-prow-ci-version.yaml index 0b7c2e777a6..9c9029ef091 100644 --- a/templates/test/ci/cluster-template-prow-ci-version.yaml +++ b/templates/test/ci/cluster-template-prow-ci-version.yaml @@ -412,7 +412,7 @@ spec: marketplace: offer: capi-windows publisher: cncf-upstream - sku: k8s-1dot23dot3-windows-2019-containerd + sku: k8s-1dot23dot3-${WINDOWS_SERVER_VERSION:=windows-2019}-containerd version: latest osDisk: diskSizeGB: 128 diff --git a/templates/test/ci/cluster-template-prow-external-cloud-provider-ci-version.yaml b/templates/test/ci/cluster-template-prow-external-cloud-provider-ci-version.yaml index 963e2c09d20..7a1dc2c43c5 100644 --- a/templates/test/ci/cluster-template-prow-external-cloud-provider-ci-version.yaml +++ b/templates/test/ci/cluster-template-prow-external-cloud-provider-ci-version.yaml @@ -413,7 +413,7 @@ spec: marketplace: offer: capi-windows publisher: cncf-upstream - sku: k8s-1dot23dot3-windows-2019-containerd + sku: k8s-1dot23dot3-${WINDOWS_SERVER_VERSION:=windows-2019}-containerd version: latest osDisk: diskSizeGB: 128 diff --git a/templates/test/ci/prow-ci-version/patches/machine-deployment-ci-version-windows.yaml b/templates/test/ci/prow-ci-version/patches/machine-deployment-ci-version-windows.yaml index baa1d5fff34..e1dcfe27d92 100644 --- a/templates/test/ci/prow-ci-version/patches/machine-deployment-ci-version-windows.yaml +++ b/templates/test/ci/prow-ci-version/patches/machine-deployment-ci-version-windows.yaml @@ -11,6 +11,6 @@ spec: marketplace: publisher: cncf-upstream offer: capi-windows - sku: k8s-1dot23dot3-windows-2019-containerd + sku: k8s-1dot23dot3-${WINDOWS_SERVER_VERSION:=windows-2019}-containerd version: "latest"