Skip to content

Commit 275f9ee

Browse files
authored
ci: Use explicit templates for Windows infra (#5906)
* ci: Use explicit templates for Windows infra * omit Windows pool from ClusterClass test scenario * use new machine-pool-windows template for VMSS test * add a separate Windows test * non-Windows test scenario should not test Windows LB * use shorter “win” name to avoid API issues
1 parent f7eb77d commit 275f9ee

File tree

72 files changed

+7703
-7406
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+7703
-7406
lines changed

docs/book/src/developers/development.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -586,7 +586,7 @@ You can optionally set the following variables:
586586
| `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). |
587587
| `TEST_CCM` | Build a cluster that uses custom versions of the Azure cloud-provider cloud-controller-manager and node-controller-manager images |
588588
| `EXP_MACHINE_POOL` | Use [Machine Pool](../self-managed/machinepools.md) for worker machines. Defaults to true. |
589-
| `TEST_WINDOWS` | Build a cluster that has Windows worker nodes. |
589+
| `TEST_WINDOWS` | Set to "true" to build a cluster that has Windows worker nodes. |
590590
| `REGISTRY` | Registry to push any custom k8s images or cloud provider images built. |
591591
| `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. |
592592
| `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. |

scripts/ci-entrypoint.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ setup() {
117117
export EXP_CLUSTER_RESOURCE_SET="true"
118118

119119
# TODO figure out a better way to account for expected Windows node count
120-
if [[ -n "${TEST_WINDOWS:-}" ]]; then
120+
if [[ "${TEST_WINDOWS:-}" == "true" ]]; then
121121
export WINDOWS_WORKER_MACHINE_COUNT="${WINDOWS_WORKER_MACHINE_COUNT:-2}"
122122
fi
123123
}
@@ -139,6 +139,10 @@ select_cluster_template() {
139139
export CLUSTER_TEMPLATE="${CLUSTER_TEMPLATE/custom-builds/custom-builds-machine-pool}"
140140
fi
141141
fi
142+
143+
if [[ "${TEST_WINDOWS:-}" == "true" ]]; then
144+
export CLUSTER_TEMPLATE="${CLUSTER_TEMPLATE/.yaml/-windows.yaml}"
145+
fi
142146
}
143147

144148
create_cluster() {

0 commit comments

Comments
 (0)