Skip to content

Commit 628269d

Browse files
authored
Merge pull request #35701 from jackfrancis/capz-windows-remove-for-false
capz: remove WINDOWS and TEST_WINDOWS env vars
2 parents 43ee693 + 1283b02 commit 628269d

File tree

5 files changed

+0
-46
lines changed

5 files changed

+0
-46
lines changed

config/jobs/kubernetes-sigs/cluster-api-provider-azure/cluster-api-provider-azure-presubmits-main.yaml

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -786,11 +786,6 @@ presubmits:
786786
# docker-in-docker needs privileged mode
787787
securityContext:
788788
privileged: true
789-
env:
790-
- name: TEST_WINDOWS
791-
value: "" # disabled
792-
- name: WINDOWS_SERVER_VERSION
793-
value: "windows-2022"
794789
resources:
795790
limits:
796791
cpu: 4
@@ -965,8 +960,6 @@ presubmits:
965960
# CAPZ variables
966961
- name: TEST_K8S
967962
value: "true"
968-
- name: WINDOWS
969-
value: "false"
970963
- name: CLUSTER_TEMPLATE
971964
value: "templates/test/dev/cluster-template-custom-builds-load.yaml"
972965
- name: AZURE_CONTROL_PLANE_MACHINE_TYPE
@@ -977,8 +970,6 @@ presubmits:
977970
value: "Standard_D8s_v3"
978971
- name: NODE_MACHINE_TYPE
979972
value: "Standard_D8s_v3"
980-
- name: TEST_WINDOWS
981-
value: "false"
982973
- name: "CONTROL_PLANE_MACHINE_COUNT"
983974
value: "5"
984975
- name: WINDOWS_WORKER_MACHINE_COUNT
@@ -1071,8 +1062,6 @@ presubmits:
10711062
# CAPZ variables
10721063
- name: TEST_K8S
10731064
value: "true"
1074-
- name: WINDOWS
1075-
value: "false"
10761065
- name: CLUSTER_TEMPLATE
10771066
value: "templates/test/dev/cluster-template-custom-builds-load-dra.yaml"
10781067
- name: AZURE_CONTROL_PLANE_MACHINE_TYPE
@@ -1083,8 +1072,6 @@ presubmits:
10831072
value: "Standard_D8s_v3"
10841073
- name: NODE_MACHINE_TYPE
10851074
value: "Standard_D8s_v3"
1086-
- name: TEST_WINDOWS
1087-
value: "false"
10881075
# Don't install Azure disk CSI driver as it's installed using a HelmChartProxy
10891076
- name: DEPLOY_AZURE_CSI_DRIVER
10901077
value: "false"
@@ -1174,8 +1161,6 @@ presubmits:
11741161
# CAPZ variables
11751162
- name: TEST_K8S
11761163
value: "true"
1177-
- name: WINDOWS
1178-
value: "false"
11791164
- name: CLUSTER_TEMPLATE
11801165
value: "templates/test/dev/cluster-template-custom-builds-load.yaml"
11811166
- name: AZURE_CONTROL_PLANE_MACHINE_TYPE
@@ -1186,8 +1171,6 @@ presubmits:
11861171
value: "Standard_D8s_v3"
11871172
- name: NODE_MACHINE_TYPE
11881173
value: "Standard_D8s_v3"
1189-
- name: TEST_WINDOWS
1190-
value: "false"
11911174
- name: "CONTROL_PLANE_MACHINE_COUNT"
11921175
value: "5"
11931176
- name: WINDOWS_WORKER_MACHINE_COUNT

config/jobs/kubernetes-sigs/cluster-api-provider-azure/cluster-api-provider-azure-presubmits-release-v1beta1.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -434,11 +434,6 @@ presubmits:
434434
# docker-in-docker needs privileged mode
435435
securityContext:
436436
privileged: true
437-
env:
438-
- name: TEST_WINDOWS
439-
value: "" # disabled
440-
- name: WINDOWS_SERVER_VERSION
441-
value: "windows-2022"
442437
resources:
443438
limits:
444439
cpu: 6

config/jobs/kubernetes/sig-scalability/DRA/sig-scalability-periodic-dra.yaml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,6 @@ periodics:
5858
# CAPZ variables
5959
- name: TEST_K8S
6060
value: "true"
61-
- name: WINDOWS
62-
value: "false"
6361
- name: CLUSTER_TEMPLATE
6462
value: "templates/test/dev/cluster-template-custom-builds-machine-pool-load-dra.yaml"
6563
- name: AZURE_CONTROL_PLANE_MACHINE_TYPE
@@ -70,8 +68,6 @@ periodics:
7068
value: "Standard_D8s_v3"
7169
- name: NODE_MACHINE_TYPE
7270
value: "Standard_D8s_v3"
73-
- name: TEST_WINDOWS
74-
value: "false"
7571
- name: MONITORING_MACHINE_COUNT # This is the number of dedicated nodes for prometheus server
7672
value: "1" # We use the same VM size as control plane nodes, see CONTROL_PLANE_MACHINE_TYPE
7773
- name: AZURE_LOCATION
@@ -180,8 +176,6 @@ periodics:
180176
# CAPZ variables
181177
- name: TEST_K8S
182178
value: "true"
183-
- name: WINDOWS
184-
value: "false"
185179
- name: CLUSTER_TEMPLATE
186180
value: "templates/test/dev/cluster-template-custom-builds-machine-pool-load-dra.yaml"
187181
- name: AZURE_CONTROL_PLANE_MACHINE_TYPE
@@ -192,8 +186,6 @@ periodics:
192186
value: "Standard_D8s_v3"
193187
- name: NODE_MACHINE_TYPE
194188
value: "Standard_D8s_v3"
195-
- name: TEST_WINDOWS
196-
value: "false"
197189
- name: MONITORING_MACHINE_COUNT # This is the number of dedicated nodes for prometheus server
198190
value: "1" # We use the same VM size as control plane nodes, see CONTROL_PLANE_MACHINE_TYPE
199191
- name: AZURE_LOCATION

config/jobs/kubernetes/sig-scalability/DRA/sig-scalability-presubmit-dra-capz.yaml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,6 @@ presubmits:
5858
# CAPZ variables
5959
- name: TEST_K8S
6060
value: "true"
61-
- name: WINDOWS
62-
value: "false"
6361
- name: CLUSTER_TEMPLATE
6462
value: "templates/test/dev/cluster-template-custom-builds-machine-pool-load-dra.yaml"
6563
- name: AZURE_CONTROL_PLANE_MACHINE_TYPE
@@ -70,8 +68,6 @@ presubmits:
7068
value: "Standard_D8s_v3"
7169
- name: NODE_MACHINE_TYPE
7270
value: "Standard_D8s_v3"
73-
- name: TEST_WINDOWS
74-
value: "false"
7571
- name: MONITORING_MACHINE_COUNT # This is the number of dedicated nodes for prometheus server
7672
value: "1" # We use the same VM size as control plane nodes, see CONTROL_PLANE_MACHINE_TYPE
7773
# Don't install Azure disk CSI driver as it's installed using a HelmChartProxy
@@ -169,8 +165,6 @@ presubmits:
169165
# CAPZ variables
170166
- name: TEST_K8S
171167
value: "true"
172-
- name: WINDOWS
173-
value: "false"
174168
- name: CLUSTER_TEMPLATE
175169
value: "templates/test/dev/cluster-template-custom-builds-machine-pool-load-dra.yaml"
176170
- name: AZURE_CONTROL_PLANE_MACHINE_TYPE
@@ -181,8 +175,6 @@ presubmits:
181175
value: "Standard_D8s_v3"
182176
- name: NODE_MACHINE_TYPE
183177
value: "Standard_D8s_v3"
184-
- name: TEST_WINDOWS
185-
value: "false"
186178
- name: MONITORING_MACHINE_COUNT # This is the number of dedicated nodes for prometheus server
187179
value: "1" # We use the same VM size as control plane nodes, see CONTROL_PLANE_MACHINE_TYPE
188180
# Don't install Azure disk CSI driver as it's installed using a HelmChartProxy
@@ -286,8 +278,6 @@ presubmits:
286278
# CAPZ variables
287279
- name: TEST_K8S
288280
value: "true"
289-
- name: WINDOWS
290-
value: "false"
291281
- name: CLUSTER_TEMPLATE
292282
value: "templates/test/dev/cluster-template-custom-builds-machine-pool-load-dra.yaml"
293283
- name: AZURE_CONTROL_PLANE_MACHINE_TYPE
@@ -298,8 +288,6 @@ presubmits:
298288
value: "Standard_D2s_v3"
299289
- name: NODE_MACHINE_TYPE
300290
value: "Standard_D2s_v3"
301-
- name: TEST_WINDOWS
302-
value: "false"
303291
- name: MONITORING_MACHINE_COUNT # This is the number of dedicated nodes for prometheus server
304292
value: "1" # We use the same VM size as control plane nodes, see CONTROL_PLANE_MACHINE_TYPE
305293
# Don't install Azure disk CSI driver as it's installed using a HelmChartProxy

config/jobs/kubernetes/sig-scalability/sig-scalability-periodic-azure.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,6 @@ periodics:
6161
# CAPZ variables
6262
- name: TEST_K8S
6363
value: "true"
64-
- name: WINDOWS
65-
value: "false"
6664
- name: CLUSTER_TEMPLATE
6765
value: "templates/test/dev/cluster-template-custom-builds-load.yaml"
6866
- name: AZURE_CONTROL_PLANE_MACHINE_TYPE
@@ -73,8 +71,6 @@ periodics:
7371
value: "Standard_D8s_v3"
7472
- name: NODE_MACHINE_TYPE
7573
value: "Standard_D8s_v3"
76-
- name: TEST_WINDOWS
77-
value: "false"
7874
- name: "CONTROL_PLANE_MACHINE_COUNT"
7975
value: "5"
8076
- name: WINDOWS_WORKER_MACHINE_COUNT

0 commit comments

Comments
 (0)