Skip to content

Commit c9028da

Browse files
jsturtevantjsturtevant
committed
Move to compute gallery
CAPZ is now publishing images to community gallery that lives in the CNCF subscription. See https://capz.sigs.k8s.io/self-managed/custom-images.html?highlight=computeGallery#using-azure-community-gallery and kubernetes-sigs/cluster-api-provider-azure#5167. Signed-off-by: James Sturtevant <[email protected]>
1 parent f7110f2 commit c9028da

File tree

9 files changed

+46
-57
lines changed

9 files changed

+46
-57
lines changed

‎capz/templates/ci/kustomization.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ namespace: default
44
resources:
55
- ../windows-base.yaml
66
patches:
7-
- path: patches/market-place.yaml
7+
- path: patches/compute-gallery.yaml
88
- target:
99
group: controlplane.cluster.x-k8s.io
1010
version: v1beta1

‎capz/templates/ci/patches/market-place.yaml renamed to ‎capz/templates/ci/patches/compute-gallery.yaml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ spec:
99
template:
1010
spec:
1111
image:
12-
marketplace:
13-
offer: capi-windows
14-
publisher: cncf-upstream
15-
sku: ${IMAGE_SKU:=windows-2019-containerd-gen1}
16-
version: ${IMAGE_VERSION:="latest"}
12+
computeGallery:
13+
name: "ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019"
14+
gallery: "${IMAGE_GALLERY:=capi-win-2022-containerd}"
15+
version: "${IMAGE_VERSION:=latest}"

‎capz/templates/gmsa-ci.yaml

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -403,11 +403,10 @@ spec:
403403
nameSuffix: etcddisk
404404
identity: UserAssigned
405405
image:
406-
marketplace:
407-
offer: capi
408-
publisher: cncf-upstream
409-
sku: ubuntu-2204-gen1
410-
version: latest
406+
computeGallery:
407+
gallery: capi-ubun2-2404
408+
name: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019
409+
version: ${IMAGE_VERSION:=latest}
411410
osDisk:
412411
diskSizeGB: 128
413412
osType: Linux
@@ -431,11 +430,10 @@ spec:
431430
spec:
432431
identity: UserAssigned
433432
image:
434-
marketplace:
435-
offer: capi-windows
436-
publisher: cncf-upstream
437-
sku: ${IMAGE_SKU:=windows-2019-containerd-gen1}
438-
version: ${IMAGE_VERSION:="latest"}
433+
computeGallery:
434+
gallery: ${IMAGE_GALLERY:=capi-win-2022-containerd}
435+
name: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019
436+
version: ${IMAGE_VERSION:=latest}
439437
osDisk:
440438
diskSizeGB: 128
441439
managedDisk:

‎capz/templates/gmsa-pr.yaml

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -391,11 +391,10 @@ spec:
391391
nameSuffix: etcddisk
392392
identity: UserAssigned
393393
image:
394-
marketplace:
395-
offer: capi
396-
publisher: cncf-upstream
397-
sku: ubuntu-2204-gen1
398-
version: latest
394+
computeGallery:
395+
gallery: capi-ubun2-2404
396+
name: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019
397+
version: ${IMAGE_VERSION:=latest}
399398
osDisk:
400399
diskSizeGB: 128
401400
osType: Linux
@@ -419,11 +418,10 @@ spec:
419418
spec:
420419
identity: UserAssigned
421420
image:
422-
marketplace:
423-
offer: capi-windows
424-
publisher: cncf-upstream
425-
sku: ${IMAGE_SKU:=windows-2019-containerd-gen1}
426-
version: ${IMAGE_VERSION:="latest"}
421+
computeGallery:
422+
gallery: ${IMAGE_GALLERY:=capi-win-2022-containerd}
423+
name: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019
424+
version: ${IMAGE_VERSION:=latest}
427425
osDisk:
428426
diskSizeGB: 128
429427
managedDisk:

‎capz/templates/pr/kustomization.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ namespace: default
44
resources:
55
- ../windows-base.yaml
66
patches:
7-
- path: ../ci/patches/market-place.yaml
7+
- path: ../ci/patches/compute-gallery.yaml
88
- path: ./patches/kubeadm-control-plane-pr.yaml
99
- target:
1010
group: controlplane.cluster.x-k8s.io

‎capz/templates/shared-image-gallery-ci.yaml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -406,11 +406,10 @@ spec:
406406
nameSuffix: etcddisk
407407
identity: UserAssigned
408408
image:
409-
marketplace:
410-
offer: capi
411-
publisher: cncf-upstream
412-
sku: ubuntu-2204-gen1
413-
version: latest
409+
computeGallery:
410+
gallery: capi-ubun2-2404
411+
name: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019
412+
version: ${IMAGE_VERSION:=latest}
414413
osDisk:
415414
diskSizeGB: 128
416415
osType: Linux

‎capz/templates/windows-base.yaml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -303,11 +303,10 @@ spec:
303303
nameSuffix: etcddisk
304304
identity: UserAssigned
305305
image:
306-
marketplace:
307-
offer: capi
308-
publisher: cncf-upstream
309-
sku: ubuntu-2204-gen1
310-
version: latest
306+
computeGallery:
307+
name: "ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019"
308+
gallery: "capi-ubun2-2404"
309+
version: "${IMAGE_VERSION:=latest}"
311310
osDisk:
312311
diskSizeGB: 128
313312
osType: Linux

‎capz/templates/windows-ci.yaml

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -400,11 +400,10 @@ spec:
400400
nameSuffix: etcddisk
401401
identity: UserAssigned
402402
image:
403-
marketplace:
404-
offer: capi
405-
publisher: cncf-upstream
406-
sku: ubuntu-2204-gen1
407-
version: latest
403+
computeGallery:
404+
gallery: capi-ubun2-2404
405+
name: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019
406+
version: ${IMAGE_VERSION:=latest}
408407
osDisk:
409408
diskSizeGB: 128
410409
osType: Linux
@@ -427,11 +426,10 @@ spec:
427426
runtime: containerd
428427
spec:
429428
image:
430-
marketplace:
431-
offer: capi-windows
432-
publisher: cncf-upstream
433-
sku: ${IMAGE_SKU:=windows-2019-containerd-gen1}
434-
version: ${IMAGE_VERSION:="latest"}
429+
computeGallery:
430+
gallery: ${IMAGE_GALLERY:=capi-win-2022-containerd}
431+
name: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019
432+
version: ${IMAGE_VERSION:=latest}
435433
osDisk:
436434
diskSizeGB: 128
437435
managedDisk:

‎capz/templates/windows-pr.yaml

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -388,11 +388,10 @@ spec:
388388
nameSuffix: etcddisk
389389
identity: UserAssigned
390390
image:
391-
marketplace:
392-
offer: capi
393-
publisher: cncf-upstream
394-
sku: ubuntu-2204-gen1
395-
version: latest
391+
computeGallery:
392+
gallery: capi-ubun2-2404
393+
name: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019
394+
version: ${IMAGE_VERSION:=latest}
396395
osDisk:
397396
diskSizeGB: 128
398397
osType: Linux
@@ -415,11 +414,10 @@ spec:
415414
runtime: containerd
416415
spec:
417416
image:
418-
marketplace:
419-
offer: capi-windows
420-
publisher: cncf-upstream
421-
sku: ${IMAGE_SKU:=windows-2019-containerd-gen1}
422-
version: ${IMAGE_VERSION:="latest"}
417+
computeGallery:
418+
gallery: ${IMAGE_GALLERY:=capi-win-2022-containerd}
419+
name: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019
420+
version: ${IMAGE_VERSION:=latest}
423421
osDisk:
424422
diskSizeGB: 128
425423
managedDisk:

0 commit comments

Comments
 (0)