Skip to content

Commit 61c8939

Browse files
nilo19nilo19
authored
Merge pull request #9595 from nilo19/fix/image-gallery
fix: Replace images for capz templates
2 parents bd225d8 + bb36e6e commit 61c8939

11 files changed

+100
-125
lines changed

‎tests/k8s-azure/manifest/cluster-api/cluster-template-prow-ci-version-oot-credential-provider.yaml‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -218,11 +218,10 @@ spec:
218218
lun: 0
219219
nameSuffix: etcddisk
220220
image:
221-
marketplace:
222-
offer: capi
223-
publisher: cncf-upstream
224-
sku: ubuntu-2204-gen1
225-
version: latest
221+
computeGallery:
222+
gallery: "ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019"
223+
name: "capi-ubun2-2404"
224+
version: 1.34.1
226225
osDisk:
227226
diskSizeGB: 128
228227
osType: Linux
@@ -267,11 +266,10 @@ spec:
267266
userAssignedIdentities:
268267
- providerID: /subscriptions/${AZURE_SUBSCRIPTION_ID}/resourceGroups/${CI_RG}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/${USER_IDENTITY}
269268
image:
270-
marketplace:
271-
offer: capi
272-
publisher: cncf-upstream
273-
sku: ubuntu-2204-gen1
274-
version: latest
269+
computeGallery:
270+
gallery: "ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019"
271+
name: "capi-ubun2-2404"
272+
version: 1.34.1
275273
osDisk:
276274
diskSizeGB: 128
277275
osType: Linux

‎tests/k8s-azure/manifest/cluster-api/cluster-template-prow-dual-stack-mp.yaml‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -249,11 +249,10 @@ spec:
249249
nameSuffix: etcddisk
250250
enableIPForwarding: true
251251
image:
252-
marketplace:
253-
offer: capi
254-
publisher: cncf-upstream
255-
sku: ubuntu-2204-gen1
256-
version: latest
252+
computeGallery:
253+
gallery: "ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019"
254+
name: "capi-ubun2-2404"
255+
version: 1.34.1
257256
osDisk:
258257
diskSizeGB: 128
259258
osType: Linux
@@ -300,11 +299,10 @@ spec:
300299
type: RollingUpdate
301300
template:
302301
image:
303-
marketplace:
304-
offer: capi
305-
publisher: cncf-upstream
306-
sku: ubuntu-2204-gen1
307-
version: latest
302+
computeGallery:
303+
gallery: "ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019"
304+
name: "capi-ubun2-2404"
305+
version: 1.34.1
308306
osDisk:
309307
diskSizeGB: 30
310308
managedDisk:

‎tests/k8s-azure/manifest/cluster-api/cluster-template-prow-ipv6-mp.yaml‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -256,11 +256,10 @@ spec:
256256
nameSuffix: etcddisk
257257
enableIPForwarding: true
258258
image:
259-
marketplace:
260-
offer: capi
261-
publisher: cncf-upstream
262-
sku: ubuntu-2204-gen1
263-
version: latest
259+
computeGallery:
260+
gallery: "ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019"
261+
name: "capi-ubun2-2404"
262+
version: 1.34.1
264263
osDisk:
265264
diskSizeGB: 128
266265
osType: Linux
@@ -307,11 +306,10 @@ spec:
307306
type: RollingUpdate
308307
template:
309308
image:
310-
marketplace:
311-
offer: capi
312-
publisher: cncf-upstream
313-
sku: ubuntu-2204-gen1
314-
version: latest
309+
computeGallery:
310+
gallery: "ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019"
311+
name: "capi-ubun2-2404"
312+
version: 1.34.1
315313
osDisk:
316314
diskSizeGB: 30
317315
managedDisk:

‎tests/k8s-azure/manifest/cluster-api/linux-vmss-ci-no-win-local.yaml‎

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -217,11 +217,10 @@ spec:
217217
lun: 0
218218
nameSuffix: etcddisk
219219
image:
220-
marketplace:
221-
offer: capi
222-
publisher: cncf-upstream
223-
sku: ubuntu-2204-gen1
224-
version: latest
220+
computeGallery:
221+
gallery: "ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019"
222+
name: "capi-ubun2-2404"
223+
version: 1.34.1
225224
osDisk:
226225
diskSizeGB: 128
227226
osType: Linux
@@ -269,11 +268,10 @@ spec:
269268
type: RollingUpdate
270269
template:
271270
image:
272-
marketplace:
273-
offer: capi
274-
publisher: cncf-upstream
275-
sku: ubuntu-2204-gen1
276-
version: latest
271+
computeGallery:
272+
gallery: "ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019"
273+
name: "capi-ubun2-2404"
274+
version: 1.34.1
277275
osDisk:
278276
diskSizeGB: 30
279277
managedDisk:
@@ -421,11 +419,10 @@ spec:
421419
type: RollingUpdate
422420
template:
423421
image:
424-
marketplace:
425-
offer: capi
426-
publisher: cncf-upstream
427-
sku: ubuntu-2204-gen1
428-
version: latest
422+
computeGallery:
423+
gallery: "ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019"
424+
name: "capi-ubun2-2404"
425+
version: 1.34.1
429426
osDisk:
430427
diskSizeGB: 30
431428
managedDisk:

‎tests/k8s-azure/manifest/cluster-api/linux-vmss-ci-no-win-oot-credential-provider.yaml‎

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -236,11 +236,10 @@ spec:
236236
lun: 0
237237
nameSuffix: etcddisk
238238
image:
239-
marketplace:
240-
offer: capi
241-
publisher: cncf-upstream
242-
sku: ubuntu-2204-gen1
243-
version: latest
239+
computeGallery:
240+
gallery: "ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019"
241+
name: "capi-ubun2-2404"
242+
version: 1.34.1
244243
osDisk:
245244
diskSizeGB: 128
246245
osType: Linux
@@ -288,11 +287,10 @@ spec:
288287
type: RollingUpdate
289288
template:
290289
image:
291-
marketplace:
292-
offer: capi
293-
publisher: cncf-upstream
294-
sku: ubuntu-2204-gen1
295-
version: latest
290+
computeGallery:
291+
gallery: "ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019"
292+
name: "capi-ubun2-2404"
293+
version: 1.34.1
296294
osDisk:
297295
diskSizeGB: 30
298296
managedDisk:
@@ -458,11 +456,10 @@ spec:
458456
type: RollingUpdate
459457
template:
460458
image:
461-
marketplace:
462-
offer: capi
463-
publisher: cncf-upstream
464-
sku: ubuntu-2204-gen1
465-
version: latest
459+
computeGallery:
460+
gallery: "ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019"
461+
name: "capi-ubun2-2404"
462+
version: 1.34.1
466463
osDisk:
467464
diskSizeGB: 30
468465
managedDisk:

‎tests/k8s-azure/manifest/cluster-api/linux-vmss-ci-no-win.yaml‎

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -217,11 +217,10 @@ spec:
217217
lun: 0
218218
nameSuffix: etcddisk
219219
image:
220-
marketplace:
221-
offer: capi
222-
publisher: cncf-upstream
223-
sku: ubuntu-2204-gen1
224-
version: latest
220+
computeGallery:
221+
gallery: "ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019"
222+
name: "capi-ubun2-2404"
223+
version: 1.34.1
225224
osDisk:
226225
diskSizeGB: 128
227226
osType: Linux
@@ -269,11 +268,10 @@ spec:
269268
type: RollingUpdate
270269
template:
271270
image:
272-
marketplace:
273-
offer: capi
274-
publisher: cncf-upstream
275-
sku: ubuntu-2204-gen1
276-
version: latest
271+
computeGallery:
272+
gallery: "ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019"
273+
name: "capi-ubun2-2404"
274+
version: 1.34.1
277275
osDisk:
278276
diskSizeGB: 30
279277
managedDisk:
@@ -421,11 +419,10 @@ spec:
421419
type: RollingUpdate
422420
template:
423421
image:
424-
marketplace:
425-
offer: capi
426-
publisher: cncf-upstream
427-
sku: ubuntu-2204-gen1
428-
version: latest
422+
computeGallery:
423+
gallery: "ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019"
424+
name: "capi-ubun2-2404"
425+
version: 1.34.1
429426
osDisk:
430427
diskSizeGB: 30
431428
managedDisk:

‎tests/k8s-azure/manifest/cluster-api/linux-vmss-ci-version-oot-credential-provider.yaml‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -223,11 +223,10 @@ spec:
223223
lun: 0
224224
nameSuffix: etcddisk
225225
image:
226-
marketplace:
227-
offer: capi
228-
publisher: cncf-upstream
229-
sku: ubuntu-2204-gen1
230-
version: latest
226+
computeGallery:
227+
gallery: "ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019"
228+
name: "capi-ubun2-2404"
229+
version: 1.34.1
231230
osDisk:
232231
diskSizeGB: 128
233232
osType: Linux
@@ -275,11 +274,10 @@ spec:
275274
type: RollingUpdate
276275
template:
277276
image:
278-
marketplace:
279-
offer: capi
280-
publisher: cncf-upstream
281-
sku: ubuntu-2204-gen1
282-
version: latest
277+
computeGallery:
278+
gallery: "ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019"
279+
name: "capi-ubun2-2404"
280+
version: 1.34.1
283281
osDisk:
284282
diskSizeGB: 30
285283
managedDisk:

‎tests/k8s-azure/manifest/cluster-api/linux-vmss-ci-version.yaml‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -219,11 +219,10 @@ spec:
219219
lun: 0
220220
nameSuffix: etcddisk
221221
image:
222-
marketplace:
223-
offer: capi
224-
publisher: cncf-upstream
225-
sku: ubuntu-2204-gen1
226-
version: latest
222+
computeGallery:
223+
gallery: "ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019"
224+
name: "capi-ubun2-2404"
225+
version: 1.34.1
227226
osDisk:
228227
diskSizeGB: 128
229228
osType: Linux
@@ -271,11 +270,10 @@ spec:
271270
type: RollingUpdate
272271
template:
273272
image:
274-
marketplace:
275-
offer: capi
276-
publisher: cncf-upstream
277-
sku: ubuntu-2204-gen1
278-
version: latest
273+
computeGallery:
274+
gallery: "ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019"
275+
name: "capi-ubun2-2404"
276+
version: 1.34.1
279277
osDisk:
280278
diskSizeGB: 30
281279
managedDisk:

‎tests/k8s-azure/manifest/cluster-api/linux-vmss-multiple-zones-ci-version.yaml‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -238,11 +238,10 @@ spec:
238238
lun: 0
239239
nameSuffix: etcddisk
240240
image:
241-
marketplace:
242-
offer: capi
243-
publisher: cncf-upstream
244-
sku: ubuntu-2204-gen1
245-
version: latest
241+
computeGallery:
242+
gallery: "ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019"
243+
name: "capi-ubun2-2404"
244+
version: 1.34.1
246245
osDisk:
247246
diskSizeGB: 128
248247
osType: Linux
@@ -293,11 +292,10 @@ spec:
293292
type: RollingUpdate
294293
template:
295294
image:
296-
marketplace:
297-
offer: capi
298-
publisher: cncf-upstream
299-
sku: ubuntu-2204-gen1
300-
version: latest
295+
computeGallery:
296+
gallery: "ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019"
297+
name: "capi-ubun2-2404"
298+
version: 1.34.1
301299
osDisk:
302300
diskSizeGB: 30
303301
managedDisk:

‎tests/k8s-azure/manifest/cluster-api/vmss-multi-nodepool-private.yaml‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -183,11 +183,10 @@ spec:
183183
deletePolicy: Oldest
184184
template:
185185
image:
186-
marketplace:
187-
offer: capi
188-
publisher: cncf-upstream
189-
sku: ubuntu-2204-gen1
190-
version: latest
186+
computeGallery:
187+
gallery: "ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019"
188+
name: "capi-ubun2-2404"
189+
version: 1.34.1
191190
vmSize: Standard_D2s_v3
192191
osDisk:
193192
osType: "Linux"
@@ -272,11 +271,10 @@ spec:
272271
deletePolicy: Oldest
273272
template:
274273
image:
275-
marketplace:
276-
offer: capi
277-
publisher: cncf-upstream
278-
sku: ubuntu-2204-gen1
279-
version: latest
274+
computeGallery:
275+
gallery: "ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019"
276+
name: "capi-ubun2-2404"
277+
version: 1.34.1
280278
vmSize: Standard_D2s_v3
281279
osDisk:
282280
osType: "Linux"

0 commit comments

Comments
 (0)