Skip to content

ci: Use explicit templates for Windows infra #5906

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.

Sign up for GitHub

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

Merged
merged 6 commits into from
Oct 17, 2025
Merged

ci: Use explicit templates for Windows infra #5906

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
78351e8
ci: Use explicit templates for Windows infra
jackfrancis Oct 14, 2025
ccfd498
omit Windows pool from ClusterClass test scenario
jackfrancis Oct 14, 2025
c176acc
use new machine-pool-windows template for VMSS test
jackfrancis Oct 14, 2025
841af61
add a separate Windows test
jackfrancis Oct 15, 2025
da4f547
non-Windows test scenario should not test Windows LB
jackfrancis Oct 15, 2025
414e799
use shorter “win” name to avoid API issues
jackfrancis Oct 15, 2025
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: 1 addition & 1 deletion docs/book/src/developers/development.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -586,7 +586,7 @@ You can optionally set the following variables:
| `CI_VERSION` | Provide a custom CI version of Kubernetes (e.g., `v1.25.0-alpha.0.597+aa49dffc7f24dc`). If not specified, this will be determined from the KUBERNETES_VERSION above if it is an unreleased version. If you provide a `CI_VERSION` environment variable, you may not also use `KUBERNETES_VERSION` (above). |
| `TEST_CCM` | Build a cluster that uses custom versions of the Azure cloud-provider cloud-controller-manager and node-controller-manager images |
| `EXP_MACHINE_POOL` | Use [Machine Pool](../self-managed/machinepools.md) for worker machines. Defaults to true. |
| `TEST_WINDOWS` | Build a cluster that has Windows worker nodes. |
| `TEST_WINDOWS` | Set to "true" to build a cluster that has Windows worker nodes. |
| `REGISTRY` | Registry to push any custom k8s images or cloud provider images built. |
| `CLUSTER_TEMPLATE` | Use a custom cluster template. It can be a path to a template under templates/, a path on the host or a link. If the value is not set, the script will choose the appropriate cluster template based on existing environment variables. |
| `CCM_COUNT` | Set the number of cloud-controller-manager only when `TEST_CCM` is set. Besides it should not be more than control plane Node number. |
Expand Down
6 changes: 5 additions & 1 deletion scripts/ci-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ setup() {
export EXP_CLUSTER_RESOURCE_SET="true"

# TODO figure out a better way to account for expected Windows node count
if [[ -n "${TEST_WINDOWS:-}" ]]; then
if [[ "${TEST_WINDOWS:-}" == "true" ]]; then
export WINDOWS_WORKER_MACHINE_COUNT="${WINDOWS_WORKER_MACHINE_COUNT:-2}"
fi
}
Expand All @@ -139,6 +139,10 @@ select_cluster_template() {
export CLUSTER_TEMPLATE="${CLUSTER_TEMPLATE/custom-builds/custom-builds-machine-pool}"
fi
fi

if [[ "${TEST_WINDOWS:-}" == "true" ]]; then
export CLUSTER_TEMPLATE="${CLUSTER_TEMPLATE/.yaml/-windows.yaml}"
fi
}

create_cluster() {
Expand Down
Loading
Loading