From 95d487051d865556d72c8c176c2b0f3a95d82eb2 Mon Sep 17 00:00:00 2001 From: Matt Boersma Date: Wed, 5 Nov 2025 09:44:54 -0700 Subject: [PATCH] Update test templates to community gallery images --- .../cluster-template-prow-ci-version-dra.yaml | 14 ++++++------- ...r-template-prow-ci-version-dual-stack.yaml | 14 ++++++------- ...cluster-template-prow-ci-version-ipv6.yaml | 14 ++++++------- ...er-template-prow-ci-version-md-and-mp.yaml | 21 ++++++++----------- ...ster-template-prow-ci-version-windows.yaml | 14 ++++++------- .../ci/cluster-template-prow-ci-version.yaml | 14 ++++++------- ...-prow-machine-pool-ci-version-windows.yaml | 14 ++++++------- ...template-prow-machine-pool-ci-version.yaml | 14 ++++++------- .../control-plane-image-ci-version.yaml | 7 +++---- ...e-deployment-ci-version-control-plane.yaml | 7 +++---- .../machine-deployment-ci-version.yaml | 9 ++++---- ...e-deployment-ci-version-control-plane.yaml | 7 +++---- .../machine-deployment-ci-version.yaml | 9 ++++---- .../patches/machine-pool-ci-version.yaml | 7 +++---- .../patches/machine-pool-ci-version.yaml | 7 +++---- .../cluster-template-custom-builds-dra.yaml | 14 ++++++------- ...uster-template-custom-builds-load-dra.yaml | 21 ++++++++----------- .../cluster-template-custom-builds-load.yaml | 21 ++++++++----------- ...e-custom-builds-machine-pool-load-dra.yaml | 21 ++++++++----------- ...plate-custom-builds-machine-pool-load.yaml | 21 ++++++++----------- ...te-custom-builds-machine-pool-windows.yaml | 14 ++++++------- ...r-template-custom-builds-machine-pool.yaml | 14 ++++++------- ...luster-template-custom-builds-windows.yaml | 14 ++++++------- .../dev/cluster-template-custom-builds.yaml | 14 ++++++------- .../machine-deployment-pr-version.yaml | 7 +++---- .../patches/custom-builds.yaml | 9 ++++---- .../patches/custom-builds.yaml | 9 ++++---- .../machine-deployment-pr-version.yaml | 14 ++++++------- .../machine-deployment-pr-version.yaml | 14 ++++++------- .../patches/control-plane-custom-builds.yaml | 9 ++++---- 30 files changed, 167 insertions(+), 221 deletions(-) diff --git a/templates/test/ci/cluster-template-prow-ci-version-dra.yaml b/templates/test/ci/cluster-template-prow-ci-version-dra.yaml index 86ae0a5228a..04b6c3198c7 100644 --- a/templates/test/ci/cluster-template-prow-ci-version-dra.yaml +++ b/templates/test/ci/cluster-template-prow-ci-version-dra.yaml @@ -248,10 +248,9 @@ spec: nameSuffix: etcddisk identity: UserAssigned image: - marketplace: - offer: capi - publisher: cncf-upstream - sku: ubuntu-2204-gen1 + computeGallery: + gallery: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019 + name: capi-ubun2-2404 version: latest osDisk: diskSizeGB: 128 @@ -302,10 +301,9 @@ spec: type: RollingUpdate template: image: - marketplace: - offer: capi - publisher: cncf-upstream - sku: ubuntu-2204-gen1 + computeGallery: + gallery: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019 + name: capi-ubun2-2404 version: latest osDisk: diskSizeGB: 30 diff --git a/templates/test/ci/cluster-template-prow-ci-version-dual-stack.yaml b/templates/test/ci/cluster-template-prow-ci-version-dual-stack.yaml index 628b4d32753..9f15c08122e 100644 --- a/templates/test/ci/cluster-template-prow-ci-version-dual-stack.yaml +++ b/templates/test/ci/cluster-template-prow-ci-version-dual-stack.yaml @@ -255,10 +255,9 @@ spec: enableIPForwarding: true identity: UserAssigned image: - marketplace: - offer: capi - publisher: cncf-upstream - sku: ubuntu-2204-gen1 + computeGallery: + gallery: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019 + name: capi-ubun2-2404 version: latest osDisk: diskSizeGB: 128 @@ -307,10 +306,9 @@ spec: enableIPForwarding: true identity: UserAssigned image: - marketplace: - offer: capi - publisher: cncf-upstream - sku: ubuntu-2204-gen1 + computeGallery: + gallery: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019 + name: capi-ubun2-2404 version: latest osDisk: diskSizeGB: 128 diff --git a/templates/test/ci/cluster-template-prow-ci-version-ipv6.yaml b/templates/test/ci/cluster-template-prow-ci-version-ipv6.yaml index d8b3a2e7933..403a96003fc 100644 --- a/templates/test/ci/cluster-template-prow-ci-version-ipv6.yaml +++ b/templates/test/ci/cluster-template-prow-ci-version-ipv6.yaml @@ -266,10 +266,9 @@ spec: enableIPForwarding: true identity: UserAssigned image: - marketplace: - offer: capi - publisher: cncf-upstream - sku: ubuntu-2204-gen1 + computeGallery: + gallery: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019 + name: capi-ubun2-2404 version: latest osDisk: diskSizeGB: 128 @@ -318,10 +317,9 @@ spec: enableIPForwarding: true identity: UserAssigned image: - marketplace: - offer: capi - publisher: cncf-upstream - sku: ubuntu-2204-gen1 + computeGallery: + gallery: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019 + name: capi-ubun2-2404 version: latest osDisk: diskSizeGB: 128 diff --git a/templates/test/ci/cluster-template-prow-ci-version-md-and-mp.yaml b/templates/test/ci/cluster-template-prow-ci-version-md-and-mp.yaml index f2f662c3dfe..7355f7efa17 100644 --- a/templates/test/ci/cluster-template-prow-ci-version-md-and-mp.yaml +++ b/templates/test/ci/cluster-template-prow-ci-version-md-and-mp.yaml @@ -233,10 +233,9 @@ spec: nameSuffix: etcddisk identity: UserAssigned image: - marketplace: - offer: capi - publisher: cncf-upstream - sku: ubuntu-2204-gen1 + computeGallery: + gallery: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019 + name: capi-ubun2-2404 version: latest osDisk: diskSizeGB: 128 @@ -284,10 +283,9 @@ spec: monitoring: virtualmachine identity: UserAssigned image: - marketplace: - offer: capi - publisher: cncf-upstream - sku: ubuntu-2204-gen1 + computeGallery: + gallery: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019 + name: capi-ubun2-2404 version: latest osDisk: diskSizeGB: 128 @@ -897,10 +895,9 @@ spec: type: RollingUpdate template: image: - marketplace: - offer: capi - publisher: cncf-upstream - sku: ubuntu-2204-gen1 + computeGallery: + gallery: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019 + name: capi-ubun2-2404 version: latest osDisk: diskSizeGB: 30 diff --git a/templates/test/ci/cluster-template-prow-ci-version-windows.yaml b/templates/test/ci/cluster-template-prow-ci-version-windows.yaml index ca42199b52d..6f82404a374 100644 --- a/templates/test/ci/cluster-template-prow-ci-version-windows.yaml +++ b/templates/test/ci/cluster-template-prow-ci-version-windows.yaml @@ -237,10 +237,9 @@ spec: nameSuffix: etcddisk identity: UserAssigned image: - marketplace: - offer: capi - publisher: cncf-upstream - sku: ubuntu-2204-gen1 + computeGallery: + gallery: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019 + name: capi-ubun2-2404 version: latest osDisk: diskSizeGB: 128 @@ -288,10 +287,9 @@ spec: monitoring: virtualmachine identity: UserAssigned image: - marketplace: - offer: capi - publisher: cncf-upstream - sku: ubuntu-2204-gen1 + computeGallery: + gallery: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019 + name: capi-ubun2-2404 version: latest osDisk: diskSizeGB: 128 diff --git a/templates/test/ci/cluster-template-prow-ci-version.yaml b/templates/test/ci/cluster-template-prow-ci-version.yaml index 82fd83c3cdd..e989caa2307 100644 --- a/templates/test/ci/cluster-template-prow-ci-version.yaml +++ b/templates/test/ci/cluster-template-prow-ci-version.yaml @@ -233,10 +233,9 @@ spec: nameSuffix: etcddisk identity: UserAssigned image: - marketplace: - offer: capi - publisher: cncf-upstream - sku: ubuntu-2204-gen1 + computeGallery: + gallery: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019 + name: capi-ubun2-2404 version: latest osDisk: diskSizeGB: 128 @@ -284,10 +283,9 @@ spec: monitoring: virtualmachine identity: UserAssigned image: - marketplace: - offer: capi - publisher: cncf-upstream - sku: ubuntu-2204-gen1 + computeGallery: + gallery: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019 + name: capi-ubun2-2404 version: latest osDisk: diskSizeGB: 128 diff --git a/templates/test/ci/cluster-template-prow-machine-pool-ci-version-windows.yaml b/templates/test/ci/cluster-template-prow-machine-pool-ci-version-windows.yaml index 3c8ae2604db..debaa5f0094 100644 --- a/templates/test/ci/cluster-template-prow-machine-pool-ci-version-windows.yaml +++ b/templates/test/ci/cluster-template-prow-machine-pool-ci-version-windows.yaml @@ -234,10 +234,9 @@ spec: nameSuffix: etcddisk identity: UserAssigned image: - marketplace: - offer: capi - publisher: cncf-upstream - sku: ubuntu-2204-gen1 + computeGallery: + gallery: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019 + name: capi-ubun2-2404 version: latest osDisk: diskSizeGB: 128 @@ -288,10 +287,9 @@ spec: type: RollingUpdate template: image: - marketplace: - offer: capi - publisher: cncf-upstream - sku: ubuntu-2204-gen1 + computeGallery: + gallery: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019 + name: capi-ubun2-2404 version: latest osDisk: diskSizeGB: 30 diff --git a/templates/test/ci/cluster-template-prow-machine-pool-ci-version.yaml b/templates/test/ci/cluster-template-prow-machine-pool-ci-version.yaml index b7681b28755..ed2b6c9ab91 100644 --- a/templates/test/ci/cluster-template-prow-machine-pool-ci-version.yaml +++ b/templates/test/ci/cluster-template-prow-machine-pool-ci-version.yaml @@ -230,10 +230,9 @@ spec: nameSuffix: etcddisk identity: UserAssigned image: - marketplace: - offer: capi - publisher: cncf-upstream - sku: ubuntu-2204-gen1 + computeGallery: + gallery: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019 + name: capi-ubun2-2404 version: latest osDisk: diskSizeGB: 128 @@ -284,10 +283,9 @@ spec: type: RollingUpdate template: image: - marketplace: - offer: capi - publisher: cncf-upstream - sku: ubuntu-2204-gen1 + computeGallery: + gallery: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019 + name: capi-ubun2-2404 version: latest osDisk: diskSizeGB: 30 diff --git a/templates/test/ci/patches/control-plane-image-ci-version.yaml b/templates/test/ci/patches/control-plane-image-ci-version.yaml index f7da40224af..1fe2f218e79 100644 --- a/templates/test/ci/patches/control-plane-image-ci-version.yaml +++ b/templates/test/ci/patches/control-plane-image-ci-version.yaml @@ -8,8 +8,7 @@ spec: image: # we use the latest image as a workaround there is no published marketplace image for k8s CI versions. # latest binaries and images will get replaced to the desired version by the script above. - marketplace: - publisher: cncf-upstream - offer: capi - sku: ubuntu-2204-gen1 + computeGallery: + gallery: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019 + name: capi-ubun2-2404 version: latest diff --git a/templates/test/ci/prow-ci-version-windows/patches/machine-deployment-ci-version-control-plane.yaml b/templates/test/ci/prow-ci-version-windows/patches/machine-deployment-ci-version-control-plane.yaml index 6d70324510c..003e7c474dd 100644 --- a/templates/test/ci/prow-ci-version-windows/patches/machine-deployment-ci-version-control-plane.yaml +++ b/templates/test/ci/prow-ci-version-windows/patches/machine-deployment-ci-version-control-plane.yaml @@ -12,10 +12,9 @@ spec: nameSuffix: etcddisk identity: UserAssigned image: - marketplace: - offer: capi - publisher: cncf-upstream - sku: ubuntu-2204-gen1 + computeGallery: + gallery: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019 + name: capi-ubun2-2404 version: latest osDisk: diskSizeGB: 128 diff --git a/templates/test/ci/prow-ci-version-windows/patches/machine-deployment-ci-version.yaml b/templates/test/ci/prow-ci-version-windows/patches/machine-deployment-ci-version.yaml index 65eb8a4bb3f..8d64a1836eb 100644 --- a/templates/test/ci/prow-ci-version-windows/patches/machine-deployment-ci-version.yaml +++ b/templates/test/ci/prow-ci-version-windows/patches/machine-deployment-ci-version.yaml @@ -8,8 +8,7 @@ spec: image: # we use the latest image as a workaround there is no published marketplace image for k8s CI versions. # latest binaries and images will get replaced to the desired version by the script in this template. - marketplace: - publisher: cncf-upstream - offer: capi - sku: ubuntu-2204-gen1 - version: "latest" + computeGallery: + gallery: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019 + name: capi-ubun2-2404 + version: latest diff --git a/templates/test/ci/prow-ci-version/patches/machine-deployment-ci-version-control-plane.yaml b/templates/test/ci/prow-ci-version/patches/machine-deployment-ci-version-control-plane.yaml index 6d70324510c..003e7c474dd 100644 --- a/templates/test/ci/prow-ci-version/patches/machine-deployment-ci-version-control-plane.yaml +++ b/templates/test/ci/prow-ci-version/patches/machine-deployment-ci-version-control-plane.yaml @@ -12,10 +12,9 @@ spec: nameSuffix: etcddisk identity: UserAssigned image: - marketplace: - offer: capi - publisher: cncf-upstream - sku: ubuntu-2204-gen1 + computeGallery: + gallery: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019 + name: capi-ubun2-2404 version: latest osDisk: diskSizeGB: 128 diff --git a/templates/test/ci/prow-ci-version/patches/machine-deployment-ci-version.yaml b/templates/test/ci/prow-ci-version/patches/machine-deployment-ci-version.yaml index 65eb8a4bb3f..8d64a1836eb 100644 --- a/templates/test/ci/prow-ci-version/patches/machine-deployment-ci-version.yaml +++ b/templates/test/ci/prow-ci-version/patches/machine-deployment-ci-version.yaml @@ -8,8 +8,7 @@ spec: image: # we use the latest image as a workaround there is no published marketplace image for k8s CI versions. # latest binaries and images will get replaced to the desired version by the script in this template. - marketplace: - publisher: cncf-upstream - offer: capi - sku: ubuntu-2204-gen1 - version: "latest" + computeGallery: + gallery: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019 + name: capi-ubun2-2404 + version: latest diff --git a/templates/test/ci/prow-machine-pool-ci-version-windows/patches/machine-pool-ci-version.yaml b/templates/test/ci/prow-machine-pool-ci-version-windows/patches/machine-pool-ci-version.yaml index 74718bda519..ea8043c613d 100644 --- a/templates/test/ci/prow-machine-pool-ci-version-windows/patches/machine-pool-ci-version.yaml +++ b/templates/test/ci/prow-machine-pool-ci-version-windows/patches/machine-pool-ci-version.yaml @@ -7,8 +7,7 @@ spec: image: # we use the latest image as a workaround there is no published marketplace image for k8s CI versions. # latest binaries and images will get replaced to the desired version by the script above. - marketplace: - publisher: cncf-upstream - offer: capi - sku: ubuntu-2204-gen1 + computeGallery: + gallery: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019 + name: capi-ubun2-2404 version: latest diff --git a/templates/test/ci/prow-machine-pool-ci-version/patches/machine-pool-ci-version.yaml b/templates/test/ci/prow-machine-pool-ci-version/patches/machine-pool-ci-version.yaml index 74718bda519..ea8043c613d 100644 --- a/templates/test/ci/prow-machine-pool-ci-version/patches/machine-pool-ci-version.yaml +++ b/templates/test/ci/prow-machine-pool-ci-version/patches/machine-pool-ci-version.yaml @@ -7,8 +7,7 @@ spec: image: # we use the latest image as a workaround there is no published marketplace image for k8s CI versions. # latest binaries and images will get replaced to the desired version by the script above. - marketplace: - publisher: cncf-upstream - offer: capi - sku: ubuntu-2204-gen1 + computeGallery: + gallery: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019 + name: capi-ubun2-2404 version: latest diff --git a/templates/test/dev/cluster-template-custom-builds-dra.yaml b/templates/test/dev/cluster-template-custom-builds-dra.yaml index 726f838e099..23771c9b1f7 100644 --- a/templates/test/dev/cluster-template-custom-builds-dra.yaml +++ b/templates/test/dev/cluster-template-custom-builds-dra.yaml @@ -251,10 +251,9 @@ spec: nameSuffix: etcddisk identity: UserAssigned image: - marketplace: - offer: capi - publisher: cncf-upstream - sku: ubuntu-2204-gen1 + computeGallery: + gallery: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019 + name: capi-ubun2-2404 version: latest osDisk: diskSizeGB: 128 @@ -304,10 +303,9 @@ spec: type: RollingUpdate template: image: - marketplace: - offer: capi - publisher: cncf-upstream - sku: ubuntu-2204-gen1 + computeGallery: + gallery: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019 + name: capi-ubun2-2404 version: latest osDisk: diskSizeGB: 30 diff --git a/templates/test/dev/cluster-template-custom-builds-load-dra.yaml b/templates/test/dev/cluster-template-custom-builds-load-dra.yaml index d3bdb4a0d9c..e1690500a32 100644 --- a/templates/test/dev/cluster-template-custom-builds-load-dra.yaml +++ b/templates/test/dev/cluster-template-custom-builds-load-dra.yaml @@ -249,10 +249,9 @@ spec: nameSuffix: etcddisk identity: UserAssigned image: - marketplace: - offer: capi - publisher: cncf-upstream - sku: ubuntu-2204-gen1 + computeGallery: + gallery: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019 + name: capi-ubun2-2404 version: latest osDisk: diskSizeGB: 128 @@ -300,10 +299,9 @@ spec: monitoring: dra identity: UserAssigned image: - marketplace: - offer: capi - publisher: cncf-upstream - sku: ubuntu-2204-gen1 + computeGallery: + gallery: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019 + name: capi-ubun2-2404 version: latest osDisk: diskSizeGB: 128 @@ -878,10 +876,9 @@ spec: monitoring: dra identity: UserAssigned image: - marketplace: - offer: capi - publisher: cncf-upstream - sku: ubuntu-2204-gen1 + computeGallery: + gallery: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019 + name: capi-ubun2-2404 version: latest osDisk: diskSizeGB: 128 diff --git a/templates/test/dev/cluster-template-custom-builds-load.yaml b/templates/test/dev/cluster-template-custom-builds-load.yaml index c2326526af5..389be1d53b8 100644 --- a/templates/test/dev/cluster-template-custom-builds-load.yaml +++ b/templates/test/dev/cluster-template-custom-builds-load.yaml @@ -231,10 +231,9 @@ spec: nameSuffix: etcddisk identity: UserAssigned image: - marketplace: - offer: capi - publisher: cncf-upstream - sku: ubuntu-2204-gen1 + computeGallery: + gallery: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019 + name: capi-ubun2-2404 version: latest osDisk: diskSizeGB: 128 @@ -282,10 +281,9 @@ spec: monitoring: load identity: UserAssigned image: - marketplace: - offer: capi - publisher: cncf-upstream - sku: ubuntu-2204-gen1 + computeGallery: + gallery: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019 + name: capi-ubun2-2404 version: latest osDisk: diskSizeGB: 128 @@ -849,10 +847,9 @@ spec: monitoring: load identity: UserAssigned image: - marketplace: - offer: capi - publisher: cncf-upstream - sku: ubuntu-2204-gen1 + computeGallery: + gallery: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019 + name: capi-ubun2-2404 version: latest osDisk: diskSizeGB: 128 diff --git a/templates/test/dev/cluster-template-custom-builds-machine-pool-load-dra.yaml b/templates/test/dev/cluster-template-custom-builds-machine-pool-load-dra.yaml index d628dbb43d9..83657c5e737 100644 --- a/templates/test/dev/cluster-template-custom-builds-machine-pool-load-dra.yaml +++ b/templates/test/dev/cluster-template-custom-builds-machine-pool-load-dra.yaml @@ -259,10 +259,9 @@ spec: nameSuffix: etcddisk identity: UserAssigned image: - marketplace: - offer: capi - publisher: cncf-upstream - sku: ubuntu-2204-gen1 + computeGallery: + gallery: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019 + name: capi-ubun2-2404 version: latest osDisk: diskSizeGB: 128 @@ -314,10 +313,9 @@ spec: type: RollingUpdate template: image: - marketplace: - offer: capi - publisher: cncf-upstream - sku: ubuntu-2204-gen1 + computeGallery: + gallery: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019 + name: capi-ubun2-2404 version: latest osDisk: diskSizeGB: 30 @@ -659,10 +657,9 @@ spec: monitoring: dra identity: UserAssigned image: - marketplace: - offer: capi - publisher: cncf-upstream - sku: ubuntu-2204-gen1 + computeGallery: + gallery: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019 + name: capi-ubun2-2404 version: latest osDisk: diskSizeGB: 128 diff --git a/templates/test/dev/cluster-template-custom-builds-machine-pool-load.yaml b/templates/test/dev/cluster-template-custom-builds-machine-pool-load.yaml index 22f2d710d96..49174807bd0 100644 --- a/templates/test/dev/cluster-template-custom-builds-machine-pool-load.yaml +++ b/templates/test/dev/cluster-template-custom-builds-machine-pool-load.yaml @@ -241,10 +241,9 @@ spec: nameSuffix: etcddisk identity: UserAssigned image: - marketplace: - offer: capi - publisher: cncf-upstream - sku: ubuntu-2204-gen1 + computeGallery: + gallery: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019 + name: capi-ubun2-2404 version: latest osDisk: diskSizeGB: 128 @@ -296,10 +295,9 @@ spec: type: RollingUpdate template: image: - marketplace: - offer: capi - publisher: cncf-upstream - sku: ubuntu-2204-gen1 + computeGallery: + gallery: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019 + name: capi-ubun2-2404 version: latest osDisk: diskSizeGB: 30 @@ -630,10 +628,9 @@ spec: monitoring: load identity: UserAssigned image: - marketplace: - offer: capi - publisher: cncf-upstream - sku: ubuntu-2204-gen1 + computeGallery: + gallery: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019 + name: capi-ubun2-2404 version: latest osDisk: diskSizeGB: 128 diff --git a/templates/test/dev/cluster-template-custom-builds-machine-pool-windows.yaml b/templates/test/dev/cluster-template-custom-builds-machine-pool-windows.yaml index 786ddf3f235..db0c7f4bf2d 100644 --- a/templates/test/dev/cluster-template-custom-builds-machine-pool-windows.yaml +++ b/templates/test/dev/cluster-template-custom-builds-machine-pool-windows.yaml @@ -237,10 +237,9 @@ spec: nameSuffix: etcddisk identity: UserAssigned image: - marketplace: - offer: capi - publisher: cncf-upstream - sku: ubuntu-2204-gen1 + computeGallery: + gallery: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019 + name: capi-ubun2-2404 version: latest osDisk: diskSizeGB: 128 @@ -290,10 +289,9 @@ spec: type: RollingUpdate template: image: - marketplace: - offer: capi - publisher: cncf-upstream - sku: ubuntu-2204-gen1 + computeGallery: + gallery: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019 + name: capi-ubun2-2404 version: latest osDisk: diskSizeGB: 30 diff --git a/templates/test/dev/cluster-template-custom-builds-machine-pool.yaml b/templates/test/dev/cluster-template-custom-builds-machine-pool.yaml index 429ce3b3f05..d00b24ed7a5 100644 --- a/templates/test/dev/cluster-template-custom-builds-machine-pool.yaml +++ b/templates/test/dev/cluster-template-custom-builds-machine-pool.yaml @@ -233,10 +233,9 @@ spec: nameSuffix: etcddisk identity: UserAssigned image: - marketplace: - offer: capi - publisher: cncf-upstream - sku: ubuntu-2204-gen1 + computeGallery: + gallery: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019 + name: capi-ubun2-2404 version: latest osDisk: diskSizeGB: 128 @@ -286,10 +285,9 @@ spec: type: RollingUpdate template: image: - marketplace: - offer: capi - publisher: cncf-upstream - sku: ubuntu-2204-gen1 + computeGallery: + gallery: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019 + name: capi-ubun2-2404 version: latest osDisk: diskSizeGB: 30 diff --git a/templates/test/dev/cluster-template-custom-builds-windows.yaml b/templates/test/dev/cluster-template-custom-builds-windows.yaml index 644bc092a96..b79c19efb46 100644 --- a/templates/test/dev/cluster-template-custom-builds-windows.yaml +++ b/templates/test/dev/cluster-template-custom-builds-windows.yaml @@ -229,10 +229,9 @@ spec: nameSuffix: etcddisk identity: UserAssigned image: - marketplace: - offer: capi - publisher: cncf-upstream - sku: ubuntu-2204-gen1 + computeGallery: + gallery: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019 + name: capi-ubun2-2404 version: latest osDisk: diskSizeGB: 128 @@ -280,10 +279,9 @@ spec: monitoring: virtualmachine identity: UserAssigned image: - marketplace: - offer: capi - publisher: cncf-upstream - sku: ubuntu-2204-gen1 + computeGallery: + gallery: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019 + name: capi-ubun2-2404 version: latest osDisk: diskSizeGB: 128 diff --git a/templates/test/dev/cluster-template-custom-builds.yaml b/templates/test/dev/cluster-template-custom-builds.yaml index 335c420bc34..7f699e7396a 100644 --- a/templates/test/dev/cluster-template-custom-builds.yaml +++ b/templates/test/dev/cluster-template-custom-builds.yaml @@ -225,10 +225,9 @@ spec: nameSuffix: etcddisk identity: UserAssigned image: - marketplace: - offer: capi - publisher: cncf-upstream - sku: ubuntu-2204-gen1 + computeGallery: + gallery: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019 + name: capi-ubun2-2404 version: latest osDisk: diskSizeGB: 128 @@ -276,10 +275,9 @@ spec: monitoring: virtualmachine identity: UserAssigned image: - marketplace: - offer: capi - publisher: cncf-upstream - sku: ubuntu-2204-gen1 + computeGallery: + gallery: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019 + name: capi-ubun2-2404 version: latest osDisk: diskSizeGB: 128 diff --git a/templates/test/dev/custom-builds-load/monitoring/patches/machine-deployment-pr-version.yaml b/templates/test/dev/custom-builds-load/monitoring/patches/machine-deployment-pr-version.yaml index 5f7a688a9e4..6c5d66bf742 100644 --- a/templates/test/dev/custom-builds-load/monitoring/patches/machine-deployment-pr-version.yaml +++ b/templates/test/dev/custom-builds-load/monitoring/patches/machine-deployment-pr-version.yaml @@ -11,8 +11,7 @@ spec: image: # we use the latest image as a workaround there is no published marketplace image for k8s CI versions. # latest binaries and images will get replaced to the desired version by the script above. - marketplace: - publisher: cncf-upstream - offer: capi - sku: ubuntu-2204-gen1 + computeGallery: + gallery: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019 + name: capi-ubun2-2404 version: latest diff --git a/templates/test/dev/custom-builds-machine-pool-windows/patches/custom-builds.yaml b/templates/test/dev/custom-builds-machine-pool-windows/patches/custom-builds.yaml index 8c9da017a84..1a6afd8151e 100644 --- a/templates/test/dev/custom-builds-machine-pool-windows/patches/custom-builds.yaml +++ b/templates/test/dev/custom-builds-machine-pool-windows/patches/custom-builds.yaml @@ -23,7 +23,7 @@ spec: set -o pipefail set -o errexit [[ $(id -u) != 0 ]] && SUDO="sudo" || SUDO="" - + # Run the az login command with managed identity if az login --identity > /dev/null 2>&1; then echo "Logged in Azure with managed identity" @@ -79,8 +79,7 @@ spec: image: # we use the latest image as a workaround there is no published marketplace image for k8s CI versions. # latest binaries and images will get replaced to the desired version by the script above. - marketplace: - publisher: cncf-upstream - offer: capi - sku: ubuntu-2204-gen1 + computeGallery: + gallery: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019 + name: capi-ubun2-2404 version: latest diff --git a/templates/test/dev/custom-builds-machine-pool/patches/custom-builds.yaml b/templates/test/dev/custom-builds-machine-pool/patches/custom-builds.yaml index 8c9da017a84..1a6afd8151e 100644 --- a/templates/test/dev/custom-builds-machine-pool/patches/custom-builds.yaml +++ b/templates/test/dev/custom-builds-machine-pool/patches/custom-builds.yaml @@ -23,7 +23,7 @@ spec: set -o pipefail set -o errexit [[ $(id -u) != 0 ]] && SUDO="sudo" || SUDO="" - + # Run the az login command with managed identity if az login --identity > /dev/null 2>&1; then echo "Logged in Azure with managed identity" @@ -79,8 +79,7 @@ spec: image: # we use the latest image as a workaround there is no published marketplace image for k8s CI versions. # latest binaries and images will get replaced to the desired version by the script above. - marketplace: - publisher: cncf-upstream - offer: capi - sku: ubuntu-2204-gen1 + computeGallery: + gallery: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019 + name: capi-ubun2-2404 version: latest diff --git a/templates/test/dev/custom-builds-windows/patches/machine-deployment-pr-version.yaml b/templates/test/dev/custom-builds-windows/patches/machine-deployment-pr-version.yaml index 6b19f513702..a015666bc8b 100644 --- a/templates/test/dev/custom-builds-windows/patches/machine-deployment-pr-version.yaml +++ b/templates/test/dev/custom-builds-windows/patches/machine-deployment-pr-version.yaml @@ -11,10 +11,9 @@ spec: image: # we use the latest image as a workaround there is no published marketplace image for k8s CI versions. # latest binaries and images will get replaced to the desired version by the script above. - marketplace: - publisher: cncf-upstream - offer: capi - sku: ubuntu-2204-gen1 + computeGallery: + gallery: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019 + name: capi-ubun2-2404 version: latest --- apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 @@ -30,10 +29,9 @@ spec: image: # we use the latest image as a workaround there is no published marketplace image for k8s CI versions. # latest binaries and images will get replaced to the desired version by the script above. - marketplace: - publisher: cncf-upstream - offer: capi - sku: ubuntu-2204-gen1 + computeGallery: + gallery: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019 + name: capi-ubun2-2404 version: latest --- apiVersion: controlplane.cluster.x-k8s.io/v1beta1 diff --git a/templates/test/dev/custom-builds/patches/machine-deployment-pr-version.yaml b/templates/test/dev/custom-builds/patches/machine-deployment-pr-version.yaml index 6b19f513702..a015666bc8b 100644 --- a/templates/test/dev/custom-builds/patches/machine-deployment-pr-version.yaml +++ b/templates/test/dev/custom-builds/patches/machine-deployment-pr-version.yaml @@ -11,10 +11,9 @@ spec: image: # we use the latest image as a workaround there is no published marketplace image for k8s CI versions. # latest binaries and images will get replaced to the desired version by the script above. - marketplace: - publisher: cncf-upstream - offer: capi - sku: ubuntu-2204-gen1 + computeGallery: + gallery: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019 + name: capi-ubun2-2404 version: latest --- apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 @@ -30,10 +29,9 @@ spec: image: # we use the latest image as a workaround there is no published marketplace image for k8s CI versions. # latest binaries and images will get replaced to the desired version by the script above. - marketplace: - publisher: cncf-upstream - offer: capi - sku: ubuntu-2204-gen1 + computeGallery: + gallery: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019 + name: capi-ubun2-2404 version: latest --- apiVersion: controlplane.cluster.x-k8s.io/v1beta1 diff --git a/templates/test/dev/patches/control-plane-custom-builds.yaml b/templates/test/dev/patches/control-plane-custom-builds.yaml index 4f1418a19a5..9cbcb20a1e2 100644 --- a/templates/test/dev/patches/control-plane-custom-builds.yaml +++ b/templates/test/dev/patches/control-plane-custom-builds.yaml @@ -43,7 +43,7 @@ spec: done fi systemctl restart kubelet - + # prepull images from gcr.io/k8s-staging-ci-images and retag it to # registry.k8s.io so kubeadm can fetch correct images no matter what declare -a IMAGES=("kube-apiserver" "kube-controller-manager" "kube-proxy" "kube-scheduler") @@ -96,8 +96,7 @@ spec: image: # we use the latest image as a workaround there is no published marketplace image for k8s CI versions. # latest binaries and images will get replaced to the desired version by the script above. - marketplace: - publisher: cncf-upstream - offer: capi - sku: ubuntu-2204-gen1 + computeGallery: + gallery: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019 + name: capi-ubun2-2404 version: latest