Skip to content

Move to compute gallery #471

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 5 commits into from
Jan 7, 2025
+52 −58
Merged

Move to compute gallery #471

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c9028da
Move to compute gallery
jsturtevant Jan 6, 2025
0adea3e
Update regions to gallery replicated regions
jsturtevant Jan 6, 2025
be5e0cb
Use latest version of communit images
jsturtevant Jan 6, 2025
44abfd6
Use a known version
jsturtevant Jan 7, 2025
baf627e
Fix gallery and image names
jsturtevant Jan 7, 2025
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
7 changes: 6 additions & 1 deletion capz/run-capz-e2e.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,11 @@ main() {
export CAPI_VERSION="${CAPI_VERSION:-"v1.7.2"}"
export HELM_VERSION=v3.15.2
export TOOLS_BIN_DIR="${TOOLS_BIN_DIR:-$SCRIPT_ROOT/tools/bin}"

# TODO After community gallery changes merge
# remove the pinned version in https://github.com/kubernetes/test-infra/blob/5c4c374569f9fb8148bf8bf09144c242202d33fc/config/jobs/kubernetes-sigs/sig-windows/release-master-windows.yaml#L29-L30
# Then remove this reference
export IMAGE_VERSION="1.32.0"

# other config
export ARTIFACTS="${ARTIFACTS:-${PWD}/_artifacts}"
Expand Down Expand Up @@ -503,7 +508,7 @@ log() {

# all test regions must support AvailabilityZones
get_random_region() {
local REGIONS=("australiaeast" "canadacentral" "eastus" "eastus2" "northeurope" "uksouth" "westus2" "northcentralus")
local REGIONS=("australiaeast" "canadacentral" "francecentral" "germanywestcentral" "northeurope" "switzerlandnorth" "uksouth")
Copy link
Contributor

Choose a reason for hiding this comment

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

I hit some inconsistencies with image replication across the different regions, and locked to northcentralus till I'd had a chance to review it.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

CAPZ maintains a list here: https://github.com/kubernetes-sigs/cluster-api-provider-azure/blob/71a3924a3150e38aa1dee93bc0bb7dec57d75943/hack/util.sh#L65

echo "${REGIONS[${RANDOM} % ${#REGIONS[@]}]}"
}

Expand Down
2 changes: 1 addition & 1 deletion capz/templates/ci/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ namespace: default
resources:
- ../windows-base.yaml
patches:
- path: patches/market-place.yaml
- path: patches/compute-gallery.yaml
- target:
group: controlplane.cluster.x-k8s.io
version: v1beta1
Expand Down
9 changes: 4 additions & 5 deletions capz/templates/ci/patches/market-place.yaml → ...templates/ci/patches/compute-gallery.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@ spec:
template:
spec:
image:
marketplace:
offer: capi-windows
publisher: cncf-upstream
sku: ${IMAGE_SKU:=windows-2019-containerd-gen1}
version: ${IMAGE_VERSION:="latest"}
computeGallery:
name: "${GALLERY_IMAGE_NAME:=capi-win-2022-containerd}"
gallery: "ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019"
version: "${IMAGE_VERSION:=latest}"
18 changes: 8 additions & 10 deletions capz/templates/gmsa-ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,11 +403,10 @@ spec:
nameSuffix: etcddisk
identity: UserAssigned
image:
marketplace:
offer: capi
publisher: cncf-upstream
sku: ubuntu-2204-gen1
version: latest
computeGallery:
gallery: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019
name: capi-ubun2-2404
version: ${IMAGE_VERSION:=latest}
osDisk:
diskSizeGB: 128
osType: Linux
Expand All @@ -431,11 +430,10 @@ spec:
spec:
identity: UserAssigned
image:
marketplace:
offer: capi-windows
publisher: cncf-upstream
sku: ${IMAGE_SKU:=windows-2019-containerd-gen1}
version: ${IMAGE_VERSION:="latest"}
computeGallery:
gallery: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019
name: ${GALLERY_IMAGE_NAME:=capi-win-2022-containerd}
version: ${IMAGE_VERSION:=latest}
osDisk:
diskSizeGB: 128
managedDisk:
Expand Down
18 changes: 8 additions & 10 deletions capz/templates/gmsa-pr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,11 +391,10 @@ spec:
nameSuffix: etcddisk
identity: UserAssigned
image:
marketplace:
offer: capi
publisher: cncf-upstream
sku: ubuntu-2204-gen1
version: latest
computeGallery:
gallery: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019
name: capi-ubun2-2404
version: ${IMAGE_VERSION:=latest}
osDisk:
diskSizeGB: 128
osType: Linux
Expand All @@ -419,11 +418,10 @@ spec:
spec:
identity: UserAssigned
image:
marketplace:
offer: capi-windows
publisher: cncf-upstream
sku: ${IMAGE_SKU:=windows-2019-containerd-gen1}
version: ${IMAGE_VERSION:="latest"}
computeGallery:
gallery: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019
name: ${GALLERY_IMAGE_NAME:=capi-win-2022-containerd}
version: ${IMAGE_VERSION:=latest}
osDisk:
diskSizeGB: 128
managedDisk:
Expand Down
2 changes: 1 addition & 1 deletion capz/templates/pr/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ namespace: default
resources:
- ../windows-base.yaml
patches:
- path: ../ci/patches/market-place.yaml
- path: ../ci/patches/compute-gallery.yaml
- path: ./patches/kubeadm-control-plane-pr.yaml
- target:
group: controlplane.cluster.x-k8s.io
Expand Down
9 changes: 4 additions & 5 deletions capz/templates/shared-image-gallery-ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,11 +406,10 @@ spec:
nameSuffix: etcddisk
identity: UserAssigned
image:
marketplace:
offer: capi
publisher: cncf-upstream
sku: ubuntu-2204-gen1
version: latest
computeGallery:
gallery: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019
name: capi-ubun2-2404
version: ${IMAGE_VERSION:=latest}
osDisk:
diskSizeGB: 128
osType: Linux
Expand Down
9 changes: 4 additions & 5 deletions capz/templates/windows-base.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,11 +303,10 @@ spec:
nameSuffix: etcddisk
identity: UserAssigned
image:
marketplace:
offer: capi
publisher: cncf-upstream
sku: ubuntu-2204-gen1
version: latest
computeGallery:
name: "capi-ubun2-2404"
gallery: "ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019"
version: "${IMAGE_VERSION:=latest}"
osDisk:
diskSizeGB: 128
osType: Linux
Expand Down
18 changes: 8 additions & 10 deletions capz/templates/windows-ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,11 +400,10 @@ spec:
nameSuffix: etcddisk
identity: UserAssigned
image:
marketplace:
offer: capi
publisher: cncf-upstream
sku: ubuntu-2204-gen1
version: latest
computeGallery:
gallery: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019
name: capi-ubun2-2404
version: ${IMAGE_VERSION:=latest}
osDisk:
diskSizeGB: 128
osType: Linux
Expand All @@ -427,11 +426,10 @@ spec:
runtime: containerd
spec:
image:
marketplace:
offer: capi-windows
publisher: cncf-upstream
sku: ${IMAGE_SKU:=windows-2019-containerd-gen1}
version: ${IMAGE_VERSION:="latest"}
computeGallery:
gallery: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019
name: ${GALLERY_IMAGE_NAME:=capi-win-2022-containerd}
version: ${IMAGE_VERSION:=latest}
osDisk:
diskSizeGB: 128
managedDisk:
Expand Down
18 changes: 8 additions & 10 deletions capz/templates/windows-pr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,11 +388,10 @@ spec:
nameSuffix: etcddisk
identity: UserAssigned
image:
marketplace:
offer: capi
publisher: cncf-upstream
sku: ubuntu-2204-gen1
version: latest
computeGallery:
gallery: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019
name: capi-ubun2-2404
version: ${IMAGE_VERSION:=latest}
osDisk:
diskSizeGB: 128
osType: Linux
Expand All @@ -415,11 +414,10 @@ spec:
runtime: containerd
spec:
image:
marketplace:
offer: capi-windows
publisher: cncf-upstream
sku: ${IMAGE_SKU:=windows-2019-containerd-gen1}
version: ${IMAGE_VERSION:="latest"}
computeGallery:
gallery: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019
name: ${GALLERY_IMAGE_NAME:=capi-win-2022-containerd}
version: ${IMAGE_VERSION:=latest}
osDisk:
diskSizeGB: 128
managedDisk:
Expand Down
Loading