Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Jun 3, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions scripts/ci-entrypoint.sh
Original file line number Diff 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
2 changes: 1 addition & 1 deletion templates/test/ci/cluster-template-prow-ci-version.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -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"