Merge pull request #2350 from marosset/ws2022-ci-build-fixes

ci: fixing issue where WINDOWS_SERVER_VERSION does not work for cluster-template-prow-ci-version templates
kubernetes-sigs · Jun 3, 2022 · 46671a5 · 46671a5
2 parents d96510d + 2849dc3
commit 46671a5
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git 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
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
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
@@ -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"
-Original file line number
+Diff line change
@@ Expand Up / @@ -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() {
@@ Expand Down @@