Skip to content

capz: remove WINDOWS and TEST_WINDOWS env vars #35701

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+0 −46
Open

capz: remove WINDOWS and TEST_WINDOWS env vars #35701

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 0 additions & 17 deletions ...ubernetes-sigs/cluster-api-provider-azure/cluster-api-provider-azure-presubmits-main.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -741,11 +741,6 @@ presubmits:
# docker-in-docker needs privileged mode
securityContext:
privileged: true
env:
- name: TEST_WINDOWS
value: "" # disabled
- name: WINDOWS_SERVER_VERSION
value: "windows-2022"
Comment on lines -747 to -748
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we keep this (and below for this same variable) to prevent reverting back to 2019 for these jobs?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For this particular one, I'd prefer we just address this in CAPZ by making 2022 the default (it would seem to me that this particular test won't need to re-introduce Windows requirements before we do that?)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh nvm if we're not testing Windows here anyway it doesn't matter.

resources:
limits:
cpu: 4
Expand Down Expand Up @@ -920,8 +915,6 @@ presubmits:
# CAPZ variables
- name: TEST_K8S
value: "true"
- name: WINDOWS
value: "false"
- name: CLUSTER_TEMPLATE
value: "templates/test/dev/cluster-template-custom-builds-load.yaml"
- name: AZURE_CONTROL_PLANE_MACHINE_TYPE
Expand All @@ -932,8 +925,6 @@ presubmits:
value: "Standard_D8s_v3"
- name: NODE_MACHINE_TYPE
value: "Standard_D8s_v3"
- name: TEST_WINDOWS
value: "false"
- name: "CONTROL_PLANE_MACHINE_COUNT"
value: "5"
- name: WINDOWS_WORKER_MACHINE_COUNT
Expand Down Expand Up @@ -1026,8 +1017,6 @@ presubmits:
# CAPZ variables
- name: TEST_K8S
value: "true"
- name: WINDOWS
value: "false"
- name: CLUSTER_TEMPLATE
value: "templates/test/dev/cluster-template-custom-builds-load-dra.yaml"
- name: AZURE_CONTROL_PLANE_MACHINE_TYPE
Expand All @@ -1038,8 +1027,6 @@ presubmits:
value: "Standard_D8s_v3"
- name: NODE_MACHINE_TYPE
value: "Standard_D8s_v3"
- name: TEST_WINDOWS
value: "false"
# Don't install Azure disk CSI driver as it's installed using a HelmChartProxy
- name: DEPLOY_AZURE_CSI_DRIVER
value: "false"
Expand Down Expand Up @@ -1129,8 +1116,6 @@ presubmits:
# CAPZ variables
- name: TEST_K8S
value: "true"
- name: WINDOWS
value: "false"
- name: CLUSTER_TEMPLATE
value: "templates/test/dev/cluster-template-custom-builds-load.yaml"
- name: AZURE_CONTROL_PLANE_MACHINE_TYPE
Expand All @@ -1141,8 +1126,6 @@ presubmits:
value: "Standard_D8s_v3"
- name: NODE_MACHINE_TYPE
value: "Standard_D8s_v3"
- name: TEST_WINDOWS
value: "false"
- name: "CONTROL_PLANE_MACHINE_COUNT"
value: "5"
- name: WINDOWS_WORKER_MACHINE_COUNT
Expand Down
5 changes: 0 additions & 5 deletions ...igs/cluster-api-provider-azure/cluster-api-provider-azure-presubmits-release-v1beta1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,11 +389,6 @@ presubmits:
# docker-in-docker needs privileged mode
securityContext:
privileged: true
env:
- name: TEST_WINDOWS
value: "" # disabled
- name: WINDOWS_SERVER_VERSION
value: "windows-2022"
resources:
limits:
cpu: 6
Expand Down
8 changes: 0 additions & 8 deletions config/jobs/kubernetes/sig-scalability/DRA/sig-scalability-periodic-dra.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,6 @@ periodics:
# CAPZ variables
- name: TEST_K8S
value: "true"
- name: WINDOWS
value: "false"
- name: CLUSTER_TEMPLATE
value: "templates/test/dev/cluster-template-custom-builds-machine-pool-load-dra.yaml"
- name: AZURE_CONTROL_PLANE_MACHINE_TYPE
Expand All @@ -70,8 +68,6 @@ periodics:
value: "Standard_D8s_v3"
- name: NODE_MACHINE_TYPE
value: "Standard_D8s_v3"
- name: TEST_WINDOWS
value: "false"
- name: MONITORING_MACHINE_COUNT # This is the number of dedicated nodes for prometheus server
value: "1" # We use the same VM size as control plane nodes, see CONTROL_PLANE_MACHINE_TYPE
- name: AZURE_LOCATION
Expand Down Expand Up @@ -180,8 +176,6 @@ periodics:
# CAPZ variables
- name: TEST_K8S
value: "true"
- name: WINDOWS
value: "false"
- name: CLUSTER_TEMPLATE
value: "templates/test/dev/cluster-template-custom-builds-machine-pool-load-dra.yaml"
- name: AZURE_CONTROL_PLANE_MACHINE_TYPE
Expand All @@ -192,8 +186,6 @@ periodics:
value: "Standard_D8s_v3"
- name: NODE_MACHINE_TYPE
value: "Standard_D8s_v3"
- name: TEST_WINDOWS
value: "false"
- name: MONITORING_MACHINE_COUNT # This is the number of dedicated nodes for prometheus server
value: "1" # We use the same VM size as control plane nodes, see CONTROL_PLANE_MACHINE_TYPE
- name: AZURE_LOCATION
Expand Down
12 changes: 0 additions & 12 deletions config/jobs/kubernetes/sig-scalability/DRA/sig-scalability-presubmit-dra-capz.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,6 @@ presubmits:
# CAPZ variables
- name: TEST_K8S
value: "true"
- name: WINDOWS
value: "false"
- name: CLUSTER_TEMPLATE
value: "templates/test/dev/cluster-template-custom-builds-machine-pool-load-dra.yaml"
- name: AZURE_CONTROL_PLANE_MACHINE_TYPE
Expand All @@ -70,8 +68,6 @@ presubmits:
value: "Standard_D8s_v3"
- name: NODE_MACHINE_TYPE
value: "Standard_D8s_v3"
- name: TEST_WINDOWS
value: "false"
- name: MONITORING_MACHINE_COUNT # This is the number of dedicated nodes for prometheus server
value: "1" # We use the same VM size as control plane nodes, see CONTROL_PLANE_MACHINE_TYPE
# Don't install Azure disk CSI driver as it's installed using a HelmChartProxy
Expand Down Expand Up @@ -169,8 +165,6 @@ presubmits:
# CAPZ variables
- name: TEST_K8S
value: "true"
- name: WINDOWS
value: "false"
- name: CLUSTER_TEMPLATE
value: "templates/test/dev/cluster-template-custom-builds-machine-pool-load-dra.yaml"
- name: AZURE_CONTROL_PLANE_MACHINE_TYPE
Expand All @@ -181,8 +175,6 @@ presubmits:
value: "Standard_D8s_v3"
- name: NODE_MACHINE_TYPE
value: "Standard_D8s_v3"
- name: TEST_WINDOWS
value: "false"
- name: MONITORING_MACHINE_COUNT # This is the number of dedicated nodes for prometheus server
value: "1" # We use the same VM size as control plane nodes, see CONTROL_PLANE_MACHINE_TYPE
# Don't install Azure disk CSI driver as it's installed using a HelmChartProxy
Expand Down Expand Up @@ -286,8 +278,6 @@ presubmits:
# CAPZ variables
- name: TEST_K8S
value: "true"
- name: WINDOWS
value: "false"
- name: CLUSTER_TEMPLATE
value: "templates/test/dev/cluster-template-custom-builds-machine-pool-load-dra.yaml"
- name: AZURE_CONTROL_PLANE_MACHINE_TYPE
Expand All @@ -298,8 +288,6 @@ presubmits:
value: "Standard_D2s_v3"
- name: NODE_MACHINE_TYPE
value: "Standard_D2s_v3"
- name: TEST_WINDOWS
value: "false"
- name: MONITORING_MACHINE_COUNT # This is the number of dedicated nodes for prometheus server
value: "1" # We use the same VM size as control plane nodes, see CONTROL_PLANE_MACHINE_TYPE
# Don't install Azure disk CSI driver as it's installed using a HelmChartProxy
Expand Down
4 changes: 0 additions & 4 deletions config/jobs/kubernetes/sig-scalability/sig-scalability-periodic-azure.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,6 @@ periodics:
# CAPZ variables
- name: TEST_K8S
value: "true"
- name: WINDOWS
value: "false"
- name: CLUSTER_TEMPLATE
value: "templates/test/dev/cluster-template-custom-builds-load.yaml"
- name: AZURE_CONTROL_PLANE_MACHINE_TYPE
Expand All @@ -73,8 +71,6 @@ periodics:
value: "Standard_D8s_v3"
- name: NODE_MACHINE_TYPE
value: "Standard_D8s_v3"
- name: TEST_WINDOWS
value: "false"
- name: "CONTROL_PLANE_MACHINE_COUNT"
value: "5"
- name: WINDOWS_WORKER_MACHINE_COUNT
Expand Down