Skip to content

Commit e2fe3c8

Browse files
authored
Merge pull request #5987 from nojnhuh/update-templates-1.20
[release-1.20] Update test templates to community gallery images
2 parents f9b0eaa + 2b8372e commit e2fe3c8

18 files changed

+96
-127
lines changed

templates/test/ci/cluster-template-prow-ci-version-dra.yaml

Lines changed: 6 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

templates/test/ci/cluster-template-prow-ci-version-dual-stack.yaml

Lines changed: 6 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

templates/test/ci/cluster-template-prow-ci-version-ipv6.yaml

Lines changed: 6 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

templates/test/ci/cluster-template-prow-ci-version-md-and-mp.yaml

Lines changed: 9 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

templates/test/ci/cluster-template-prow-ci-version.yaml

Lines changed: 6 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

templates/test/ci/cluster-template-prow-machine-pool-ci-version.yaml

Lines changed: 6 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

templates/test/ci/patches/control-plane-image-ci-version.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ spec:
88
image:
99
# we use the latest image as a workaround there is no published marketplace image for k8s CI versions.
1010
# latest binaries and images will get replaced to the desired version by the script above.
11-
marketplace:
12-
publisher: cncf-upstream
13-
offer: capi
14-
sku: ubuntu-2204-gen1
11+
computeGallery:
12+
gallery: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019
13+
name: capi-ubun2-2404
1514
version: latest

templates/test/ci/prow-ci-version/patches/machine-deployment-ci-version-control-plane.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,9 @@ spec:
1212
nameSuffix: etcddisk
1313
identity: UserAssigned
1414
image:
15-
marketplace:
16-
offer: capi
17-
publisher: cncf-upstream
18-
sku: ubuntu-2204-gen1
15+
computeGallery:
16+
gallery: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019
17+
name: capi-ubun2-2404
1918
version: latest
2019
osDisk:
2120
diskSizeGB: 128

templates/test/ci/prow-ci-version/patches/machine-deployment-ci-version.yaml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ spec:
88
image:
99
# we use the latest image as a workaround there is no published marketplace image for k8s CI versions.
1010
# latest binaries and images will get replaced to the desired version by the script in this template.
11-
marketplace:
12-
publisher: cncf-upstream
13-
offer: capi
14-
sku: ubuntu-2204-gen1
15-
version: "latest"
11+
computeGallery:
12+
gallery: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019
13+
name: capi-ubun2-2404
14+
version: latest

templates/test/ci/prow-machine-pool-ci-version/patches/machine-pool-ci-version.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ spec:
77
image:
88
# we use the latest image as a workaround there is no published marketplace image for k8s CI versions.
99
# latest binaries and images will get replaced to the desired version by the script above.
10-
marketplace:
11-
publisher: cncf-upstream
12-
offer: capi
13-
sku: ubuntu-2204-gen1
10+
computeGallery:
11+
gallery: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019
12+
name: capi-ubun2-2404
1413
version: latest

0 commit comments

Comments
 (0)