Skip to content

Update test templates to Linux community gallery images #5960

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 5, 2025
+167 −221
Merged

Update test templates to Linux community gallery images #5960

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions templates/test/ci/cluster-template-prow-ci-version-dra.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 6 additions & 8 deletions templates/test/ci/cluster-template-prow-ci-version-dual-stack.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 6 additions & 8 deletions templates/test/ci/cluster-template-prow-ci-version-ipv6.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 9 additions & 12 deletions templates/test/ci/cluster-template-prow-ci-version-md-and-mp.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 6 additions & 8 deletions templates/test/ci/cluster-template-prow-ci-version-windows.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 6 additions & 8 deletions templates/test/ci/cluster-template-prow-ci-version.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 6 additions & 8 deletions templates/test/ci/cluster-template-prow-machine-pool-ci-version-windows.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 6 additions & 8 deletions templates/test/ci/cluster-template-prow-machine-pool-ci-version.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 3 additions & 4 deletions templates/test/ci/patches/control-plane-image-ci-version.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Copy link
Contributor

@nojnhuh nojnhuh Nov 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Adding to the "someday" list: refactor this kustomize so we only need to make this change in one place instead of 15.

gallery: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019
name: capi-ubun2-2404
version: latest
7 changes: 3 additions & 4 deletions .../test/ci/prow-ci-version-windows/patches/machine-deployment-ci-version-control-plane.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Contributor

@nojnhuh nojnhuh Nov 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For the Windows images named ${WINDOWS_SERVER_VERSION:=windows-2019}-containerd-gen1 in the Marketplace and like capi-win-2019-containerd in the compute gallery, neither I nor Copilot found a way to do both "default the variable if not set" and "replace this pattern with this" in a single envsubst expression. Maybe it would work to default the variable in ci-entrypoint, ci-conformance, and ci-e2e then only do the pattern replacement here in the template?

Copy link
Contributor Author

@mboersma mboersma Nov 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I tried the same. I think it's either that or change WINDOWS_SERVER_VERSION in a backward-incompatible way, so it's just "2022" instead of "windows-2022". This would be simplest but requires downstream consumers of the templates potentially to change a var in testgrid jobs.

version: latest
osDisk:
diskSizeGB: 128
Expand Down
9 changes: 4 additions & 5 deletions templates/test/ci/prow-ci-version-windows/patches/machine-deployment-ci-version.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
7 changes: 3 additions & 4 deletions templates/test/ci/prow-ci-version/patches/machine-deployment-ci-version-control-plane.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 4 additions & 5 deletions templates/test/ci/prow-ci-version/patches/machine-deployment-ci-version.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
7 changes: 3 additions & 4 deletions templates/test/ci/prow-machine-pool-ci-version-windows/patches/machine-pool-ci-version.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
7 changes: 3 additions & 4 deletions templates/test/ci/prow-machine-pool-ci-version/patches/machine-pool-ci-version.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
14 changes: 6 additions & 8 deletions templates/test/dev/cluster-template-custom-builds-dra.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 9 additions & 12 deletions templates/test/dev/cluster-template-custom-builds-load-dra.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading