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 8bd68f5375f..adff0a53221 100644 --- a/templates/test/ci/cluster-template-prow-ci-version-dra.yaml +++ b/templates/test/ci/cluster-template-prow-ci-version-dra.yaml @@ -252,10 +252,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 @@ -303,10 +302,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 b577edc3a97..8864d4a430a 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 @@ -259,10 +259,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 @@ -311,10 +310,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 ef04ec3b9ed..0d3e78627eb 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 417d4c73758..37bd20a6be7 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 @@ -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 @@ -1444,10 +1442,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.yaml b/templates/test/ci/cluster-template-prow-ci-version.yaml index 7e5c635e02b..0abd75900a6 100644 --- a/templates/test/ci/cluster-template-prow-ci-version.yaml +++ b/templates/test/ci/cluster-template-prow-ci-version.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-machine-pool-ci-version.yaml b/templates/test/ci/cluster-template-prow-machine-pool-ci-version.yaml index f104cf33f37..891447eeb38 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 @@ -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 @@ -285,10 +284,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/patches/machine-deployment-ci-version-control-plane.yaml b/templates/test/ci/prow-ci-version/patches/machine-deployment-ci-version-control-plane.yaml index 8d684ecd158..0a12f38085e 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/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 ec00cc22318..0d57f217d7e 100644 --- a/templates/test/dev/cluster-template-custom-builds-dra.yaml +++ b/templates/test/dev/cluster-template-custom-builds-dra.yaml @@ -255,10 +255,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 @@ -305,10 +304,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 4d938ceb3be..afe99887663 100644 --- a/templates/test/dev/cluster-template-custom-builds-load-dra.yaml +++ b/templates/test/dev/cluster-template-custom-builds-load-dra.yaml @@ -250,10 +250,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 @@ -301,10 +300,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 5cbcea5475b..8e32b71734a 100644 --- a/templates/test/dev/cluster-template-custom-builds-load.yaml +++ b/templates/test/dev/cluster-template-custom-builds-load.yaml @@ -235,10 +235,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: 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.yaml b/templates/test/dev/cluster-template-custom-builds-machine-pool.yaml index 3f75cbf53af..3b0feed3a77 100644 --- a/templates/test/dev/cluster-template-custom-builds-machine-pool.yaml +++ b/templates/test/dev/cluster-template-custom-builds-machine-pool.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 @@ -287,10 +286,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.yaml b/templates/test/dev/cluster-template-custom-builds.yaml index 5abb71a8882..a822ba5a0d7 100644 --- a/templates/test/dev/cluster-template-custom-builds.yaml +++ b/templates/test/dev/cluster-template-custom-builds.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/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/patches/machine-deployment-pr-version.yaml b/templates/test/dev/custom-builds/patches/machine-deployment-pr-version.yaml index 60e367449c6..3f68a388db2 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