From d2671aac73e1e8143d1b7bc2f10b655aec04a80d Mon Sep 17 00:00:00 2001 From: Christian Cwienk Date: Thu, 30 Nov 2023 20:39:17 +0100 Subject: [PATCH] switch GCR -> Artifact-Registry GCR has been deprecated [0] in favour of Artifact-Registry. Thus, change push-targets for OCI-Images: - europe-docker.pkg.dev/gardener-project/snapshots for snapshots - europe-docker.pkg.dev/gardener-project/releases for releases To allow users for smooth transitioning, keep also publishing to GCR. [0] https://cloud.google.com/artifact-registry/docs/transition/transition-from-gcr --- .ci/pipeline_definitions | 15 +++++++++++++-- Makefile | 2 +- .../values.yaml | 2 +- .../values.yaml | 4 ++-- hack/test-e2e-provider-local.sh | 2 +- test/templates/network-connectivity-test.yaml.tpl | 2 +- 6 files changed, 19 insertions(+), 8 deletions(-) diff --git a/.ci/pipeline_definitions b/.ci/pipeline_definitions index 07ad74201..2b008abe6 100644 --- a/.ci/pipeline_definitions +++ b/.ci/pipeline_definitions @@ -5,6 +5,9 @@ gardener-extension-networking-cilium: image: 'golang:1.21.4' traits: component_descriptor: + ocm_repository: europe-docker.pkg.dev/gardener-project/snapshots + ocm_repository_mappings: + - repository: europe-docker.pkg.dev/gardener-project/releases component_labels: - name: 'cloud.gardener.cnudie/responsibles' value: @@ -16,7 +19,9 @@ gardener-extension-networking-cilium: publish: dockerimages: gardener-extension-networking-cilium: - image: 'eu.gcr.io/gardener-project/gardener/extensions/networking-cilium' + image: 'europe-docker.pkg.dev/gardener-project/snapshots/extensions/networking-cilium' + extra_push_targets: # may be dropped after all users updated to new registry + - eu.gcr.io/gardener-project/gardener/extensions/networking-cilium dockerfile: 'Dockerfile' target: gardener-extension-networking-cilium resource_labels: @@ -29,7 +34,9 @@ gardener-extension-networking-cilium: integrity_requirement: 'high' availability_requirement: 'high' gardener-extension-admission-cilium: - image: 'eu.gcr.io/gardener-project/gardener/extensions/admission-cilium' + image: 'europe-docker.pkg.dev/gardener-project/snapshots/extensions/admission-cilium' + extra_push_targets: # may be dropped after all users updated to new registry + - eu.gcr.io/gardener-project/gardener/extensions/admission-cilium dockerfile: 'Dockerfile' target: gardener-extension-admission-cilium resource_labels: @@ -56,6 +63,8 @@ gardener-extension-networking-cilium: traits: version: preprocess: 'finalize' + component_descriptor: + ocm_repository: europe-docker.pkg.dev/gardener-project/releases release: nextversion: 'bump_minor' next_version_callback: '.ci/prepare_release' @@ -69,6 +78,8 @@ gardener-extension-networking-cilium: publish: dockerimages: gardener-extension-networking-cilium: + image: europe-docker.pkg.dev/gardener-project/releases/extensions/networking-cilium tag_as_latest: true gardener-extension-admission-cilium: + image: europe-docker.pkg.dev/gardener-project/releases/extensions/admission-cilium tag_as_latest: true diff --git a/Makefile b/Makefile index f6210a08a..16c04a67f 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ EXTENSION_PREFIX := gardener-extension NAME := networking-cilium ADMISSION_NAME := admission-cilium -REGISTRY := eu.gcr.io/gardener-project/gardener +REGISTRY := europe-docker.pkg.dev/gardener-project/releases IMAGE_PREFIX := $(REGISTRY)/extensions REPO_ROOT := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))) HACK_DIR := $(REPO_ROOT)/hack diff --git a/charts/gardener-extension-admission-cilium/values.yaml b/charts/gardener-extension-admission-cilium/values.yaml index 3f270d67c..520c5fa0d 100644 --- a/charts/gardener-extension-admission-cilium/values.yaml +++ b/charts/gardener-extension-admission-cilium/values.yaml @@ -4,7 +4,7 @@ global: user: name: "" image: - repository: eu.gcr.io/gardener-project/gardener/extensions/admission-cilium + repository: europe-docker.pkg.dev/gardener-project/public/extensions/admission-cilium tag: latest pullPolicy: IfNotPresent replicaCount: 1 diff --git a/charts/gardener-extension-networking-cilium/values.yaml b/charts/gardener-extension-networking-cilium/values.yaml index 99ca96656..92e425f7f 100644 --- a/charts/gardener-extension-networking-cilium/values.yaml +++ b/charts/gardener-extension-networking-cilium/values.yaml @@ -1,5 +1,5 @@ image: - repository: eu.gcr.io/gardener-project/gardener/extensions/networking-cilium + repository: europe-docker.pkg.dev/gardener-project/public/extensions/networking-cilium tag: latest pullPolicy: IfNotPresent @@ -57,4 +57,4 @@ webhookConfig: ## settings for metrics, e.g. scraping by seed-prometheus metrics: enableScraping: true - port: 8080 \ No newline at end of file + port: 8080 diff --git a/hack/test-e2e-provider-local.sh b/hack/test-e2e-provider-local.sh index 101803c2d..e43ad9530 100755 --- a/hack/test-e2e-provider-local.sh +++ b/hack/test-e2e-provider-local.sh @@ -30,7 +30,7 @@ cd $repo_root version=$(git rev-parse HEAD) make docker-images -docker tag eu.gcr.io/gardener-project/gardener/extensions/networking-cilium:latest networking-cilium-local:$version +docker tag europe-docker.pkg.dev/gardener-project/releases/extensions/networking-cilium:latest networking-cilium-local:$version kind load docker-image networking-cilium-local:$version --name gardener-local mkdir -p $repo_root/tmp diff --git a/test/templates/network-connectivity-test.yaml.tpl b/test/templates/network-connectivity-test.yaml.tpl index 7341200cd..48698fee5 100644 --- a/test/templates/network-connectivity-test.yaml.tpl +++ b/test/templates/network-connectivity-test.yaml.tpl @@ -13,7 +13,7 @@ spec: app: networking-test spec: containers: - - image: eu.gcr.io/gardener-project/gardener/cilium-cli:1.2.0 + - image: europe-docker.pkg.dev/gardener-project/releases/gardener/cilium-cli:1.2.0 name: networking-shoot-tests-cilium command: ["sh", "-c"] args: