Skip to content

Commit ddce134

Browse files
authored
Adding a way to specify a shared image gallery so we can test staging images produced from image-builder before promoting them (#528)
Signed-off-by: Mark Rossett <marosset@microsoft.com>
1 parent fca46aa commit ddce134

File tree

5 files changed

+15
-5
lines changed

5 files changed

+15
-5
lines changed

capz/templates/ci/patches/compute-gallery.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ spec:
1010
spec:
1111
image:
1212
computeGallery:
13+
subscriptionID: "${AZURE_SUBSCRIPTION_ID:=46678f10-4bbb-447e-98e8-d2829589f2d8}"
14+
resourceGroup: "${AZURE_RESOURCE_GROUP:=cluster-api-gallery}"
15+
gallery: "${GALLERY_NAME:=community_gallery}"
1316
name: "${GALLERY_IMAGE_NAME:=capi-win-2022-containerd}"
14-
gallery: "ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019"
1517
version: "${IMAGE_VERSION:=latest}"

capz/templates/gmsa-ci.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -518,8 +518,10 @@ spec:
518518
identity: UserAssigned
519519
image:
520520
computeGallery:
521-
gallery: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019
521+
gallery: ${GALLERY_NAME:=community_gallery}
522522
name: ${GALLERY_IMAGE_NAME:=capi-win-2022-containerd}
523+
resourceGroup: ${AZURE_RESOURCE_GROUP:=cluster-api-gallery}
524+
subscriptionID: ${AZURE_SUBSCRIPTION_ID:=46678f10-4bbb-447e-98e8-d2829589f2d8}
523525
version: ${IMAGE_VERSION:=latest}
524526
osDisk:
525527
diskSizeGB: 128

capz/templates/gmsa-pr.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -506,8 +506,10 @@ spec:
506506
identity: UserAssigned
507507
image:
508508
computeGallery:
509-
gallery: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019
509+
gallery: ${GALLERY_NAME:=community_gallery}
510510
name: ${GALLERY_IMAGE_NAME:=capi-win-2022-containerd}
511+
resourceGroup: ${AZURE_RESOURCE_GROUP:=cluster-api-gallery}
512+
subscriptionID: ${AZURE_SUBSCRIPTION_ID:=46678f10-4bbb-447e-98e8-d2829589f2d8}
511513
version: ${IMAGE_VERSION:=latest}
512514
osDisk:
513515
diskSizeGB: 128

capz/templates/windows-ci.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -515,8 +515,10 @@ spec:
515515
identity: UserAssigned
516516
image:
517517
computeGallery:
518-
gallery: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019
518+
gallery: ${GALLERY_NAME:=community_gallery}
519519
name: ${GALLERY_IMAGE_NAME:=capi-win-2022-containerd}
520+
resourceGroup: ${AZURE_RESOURCE_GROUP:=cluster-api-gallery}
521+
subscriptionID: ${AZURE_SUBSCRIPTION_ID:=46678f10-4bbb-447e-98e8-d2829589f2d8}
520522
version: ${IMAGE_VERSION:=latest}
521523
osDisk:
522524
diskSizeGB: 128

capz/templates/windows-pr.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -503,8 +503,10 @@ spec:
503503
identity: UserAssigned
504504
image:
505505
computeGallery:
506-
gallery: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019
506+
gallery: ${GALLERY_NAME:=community_gallery}
507507
name: ${GALLERY_IMAGE_NAME:=capi-win-2022-containerd}
508+
resourceGroup: ${AZURE_RESOURCE_GROUP:=cluster-api-gallery}
509+
subscriptionID: ${AZURE_SUBSCRIPTION_ID:=46678f10-4bbb-447e-98e8-d2829589f2d8}
508510
version: ${IMAGE_VERSION:=latest}
509511
osDisk:
510512
diskSizeGB: 128

0 commit comments

Comments
 (0)