Skip to content

Commit 73d8aba

Browse files
authored
Merge pull request #33912 from andyzhangx/patch-17834
add azure csi driver windows e2e tests against k/k
2 parents 114527d + 1c5ecf0 commit 73d8aba

File tree

1 file changed

+144
-5
lines changed

1 file changed

+144
-5
lines changed

config/jobs/kubernetes/sig-cloud-provider/azure/release-master.yaml

Lines changed: 144 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ presubmits:
1717
extra_refs:
1818
- org: kubernetes-sigs
1919
repo: cluster-api-provider-azure
20-
base_ref: release-1.16
20+
base_ref: release-1.17
2121
path_alias: sigs.k8s.io/cluster-api-provider-azure
2222
workdir: true
2323
- org: kubernetes-sigs
@@ -75,7 +75,7 @@ presubmits:
7575
extra_refs:
7676
- org: kubernetes-sigs
7777
repo: cluster-api-provider-azure
78-
base_ref: release-1.16
78+
base_ref: release-1.17
7979
path_alias: sigs.k8s.io/cluster-api-provider-azure
8080
workdir: true
8181
- org: kubernetes-sigs
@@ -118,6 +118,76 @@ presubmits:
118118
testgrid-tab-name: pull-kubernetes-e2e-capz-azure-disk-vmss
119119
testgrid-alert-email: [email protected]
120120
testgrid-num-columns-recent: '30'
121+
- name: pull-kubernetes-e2e-capz-azure-disk-windows
122+
cluster: eks-prow-build-cluster
123+
decorate: true
124+
always_run: false
125+
optional: true
126+
run_if_changed: 'azure.*\.go'
127+
path_alias: k8s.io/kubernetes
128+
branches:
129+
- master # TODO(releng): Remove once repo default branch has been renamed
130+
- main
131+
labels:
132+
preset-dind-enabled: "true"
133+
preset-kind-volume-mounts: "true"
134+
preset-azure-community: "true"
135+
extra_refs:
136+
- org: kubernetes-sigs
137+
repo: cluster-api-provider-azure
138+
base_ref: release-1.17
139+
path_alias: sigs.k8s.io/cluster-api-provider-azure
140+
workdir: true
141+
- org: kubernetes-sigs
142+
repo: azuredisk-csi-driver
143+
base_ref: master
144+
path_alias: sigs.k8s.io/azuredisk-csi-driver
145+
- org: kubernetes-sigs
146+
repo: cloud-provider-azure
147+
base_ref: master
148+
path_alias: sigs.k8s.io/cloud-provider-azure
149+
spec:
150+
serviceAccountName: azure
151+
containers:
152+
- image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20241128-8df65c072f-master
153+
command:
154+
- runner.sh
155+
- ./scripts/ci-entrypoint.sh
156+
args:
157+
- bash
158+
- -c
159+
- >-
160+
cd ${GOPATH}/src/sigs.k8s.io/azuredisk-csi-driver && ./deploy/install-driver.sh master local,snapshot,enable-avset &&
161+
make e2e-test
162+
env:
163+
- name: AZURE_STORAGE_DRIVER # azuredisk-csi-driver config
164+
value: "kubernetes.io/azure-disk" # In-tree Azure disk storage class
165+
- name: WINDOWS # azuredisk-csi-driver config
166+
value: "true"
167+
- name: TEST_WINDOWS # CAPZ config
168+
value: "true"
169+
- name: WINDOWS_SERVER_VERSION # CAPZ config
170+
value: "windows-2022"
171+
- name: NODE_MACHINE_TYPE # CAPZ config
172+
value: "Standard_D4s_v3"
173+
- name: DISABLE_ZONE # azuredisk-csi-driver config
174+
value: "true"
175+
- name: WORKER_MACHINE_COUNT # CAPZ config
176+
value: "0" # Don't create any linux worker nodes
177+
securityContext:
178+
privileged: true
179+
resources:
180+
limits:
181+
cpu: 4
182+
memory: 8Gi
183+
requests:
184+
cpu: 4
185+
memory: 8Gi
186+
annotations:
187+
testgrid-dashboards: provider-azure-presubmit
188+
testgrid-tab-name: pull-kubernetes-e2e-capz-azure-disk-windows
189+
testgrid-alert-email: [email protected]
190+
testgrid-num-columns-recent: '30'
121191
- name: pull-kubernetes-e2e-capz-azure-file
122192
cluster: eks-prow-build-cluster
123193
decorate: true
@@ -135,7 +205,7 @@ presubmits:
135205
extra_refs:
136206
- org: kubernetes-sigs
137207
repo: cluster-api-provider-azure
138-
base_ref: release-1.16
208+
base_ref: release-1.17
139209
path_alias: sigs.k8s.io/cluster-api-provider-azure
140210
workdir: true
141211
- org: kubernetes-sigs
@@ -194,7 +264,7 @@ presubmits:
194264
extra_refs:
195265
- org: kubernetes-sigs
196266
repo: cluster-api-provider-azure
197-
base_ref: release-1.16
267+
base_ref: release-1.17
198268
path_alias: sigs.k8s.io/cluster-api-provider-azure
199269
workdir: true
200270
- org: kubernetes-sigs
@@ -238,6 +308,75 @@ presubmits:
238308
testgrid-tab-name: pull-kubernetes-e2e-capz-azure-file-vmss
239309
testgrid-alert-email: [email protected]
240310
testgrid-num-columns-recent: '30'
311+
- name: pull-kubernetes-e2e-capz-azure-file-windows
312+
cluster: eks-prow-build-cluster
313+
decorate: true
314+
always_run: false
315+
optional: true
316+
run_if_changed: 'azure.*\.go'
317+
path_alias: k8s.io/kubernetes
318+
branches:
319+
- master # TODO(releng): Remove once repo default branch has been renamed
320+
- main
321+
labels:
322+
preset-dind-enabled: "true"
323+
preset-kind-volume-mounts: "true"
324+
preset-azure-community: "true"
325+
extra_refs:
326+
- org: kubernetes-sigs
327+
repo: cluster-api-provider-azure
328+
base_ref: release-1.17
329+
path_alias: sigs.k8s.io/cluster-api-provider-azure
330+
workdir: true
331+
- org: kubernetes-sigs
332+
repo: azurefile-csi-driver
333+
base_ref: master
334+
path_alias: sigs.k8s.io/azurefile-csi-driver
335+
- org: kubernetes-sigs
336+
repo: cloud-provider-azure
337+
base_ref: master
338+
path_alias: sigs.k8s.io/cloud-provider-azure
339+
spec:
340+
serviceAccountName: azure
341+
containers:
342+
- image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20241128-8df65c072f-master
343+
command:
344+
- runner.sh
345+
- ./scripts/ci-entrypoint.sh
346+
args:
347+
- bash
348+
- -c
349+
- >-
350+
kubectl apply -f templates/addons/azurefile-role.yaml &&
351+
cd ${GOPATH}/src/sigs.k8s.io/azurefile-csi-driver && ./deploy/install-driver.sh master local,snapshot,enable-avset &&
352+
make e2e-test
353+
env:
354+
- name: AZURE_STORAGE_DRIVER # azuredisk-csi-driver config
355+
value: "kubernetes.io/azure-file" # In-tree Azure file storage class
356+
- name: WINDOWS # azuredisk-csi-driver config
357+
value: "true"
358+
- name: TEST_WINDOWS # CAPZ config
359+
value: "true"
360+
- name: WINDOWS_SERVER_VERSION # CAPZ config
361+
value: "windows-2022"
362+
- name: NODE_MACHINE_TYPE # CAPZ config
363+
value: "Standard_D4s_v3"
364+
- name: WORKER_MACHINE_COUNT # CAPZ config
365+
value: "0" # Don't create any linux worker nodes
366+
securityContext:
367+
privileged: true
368+
resources:
369+
limits:
370+
cpu: 4
371+
memory: 8Gi
372+
requests:
373+
cpu: 4
374+
memory: 8Gi
375+
annotations:
376+
testgrid-dashboards: provider-azure-presubmit
377+
testgrid-tab-name: pull-kubernetes-e2e-capz-azure-file-windows
378+
testgrid-alert-email: [email protected]
379+
testgrid-num-columns-recent: '30'
241380
- name: pull-kubernetes-e2e-capz-conformance
242381
cluster: eks-prow-build-cluster
243382
decorate: true
@@ -255,7 +394,7 @@ presubmits:
255394
extra_refs:
256395
- org: kubernetes-sigs
257396
repo: cluster-api-provider-azure
258-
base_ref: release-1.16
397+
base_ref: release-1.17
259398
path_alias: sigs.k8s.io/cluster-api-provider-azure
260399
workdir: true
261400
- org: kubernetes-sigs

0 commit comments

Comments
 (0)