From 31d5b49765c7ed1a8b1dd50aeb7457a02d8b18dd Mon Sep 17 00:00:00 2001 From: Shreyas Rao <42259948+shreyas-s-rao@users.noreply.github.com> Date: Tue, 2 Jan 2024 18:26:20 +0530 Subject: [PATCH] [hotfix-v0.1] Switch GCR -> Artifact-Registry (#22) * cleanup: rm redundant/obsolete attributes * 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 - europe-docker.pkg.dev/gardener-project/public for read-access to snapshots + releases [0] https://cloud.google.com/artifact-registry/docs/transition/transition-from-gcr --------- Co-authored-by: Christian Cwienk --- .ci/pipeline_definitions | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/.ci/pipeline_definitions b/.ci/pipeline_definitions index e691b980..0bd722f6 100644 --- a/.ci/pipeline_definitions +++ b/.ci/pipeline_definitions @@ -1,12 +1,12 @@ etcd-wrapper: - template: 'default' base_definition: - repo: ~ traits: version: preprocess: 'inject-commit-hash' inject_effective_version: true + component_descriptor: + ocm_repository: europe-docker.pkg.dev/gardener-project/snapshots publish: oci-builder: 'docker-buildx' platforms: @@ -14,8 +14,7 @@ etcd-wrapper: - linux/arm64 dockerimages: etcd-wrapper: - registry: 'gcr-readwrite' - image: 'eu.gcr.io/gardener-project/gardener/etcd-wrapper' + image: europe-docker.pkg.dev/gardener-project/snapshots/gardener/etcd-wrapper dockerfile: 'Dockerfile' inputs: repos: @@ -44,7 +43,9 @@ etcd-wrapper: head-update: traits: draft_release: ~ - component_descriptor: ~ + component_descriptor: + ocm_repository_mappings: + - repository: europe-docker.pkg.dev/gardener-project/releases pull-request: traits: pull-request: ~ @@ -52,6 +53,12 @@ etcd-wrapper: traits: version: preprocess: 'finalize' + component_descriptor: + ocm_repository: europe-docker.pkg.dev/gardener-project/releases + publish: + dockerimages: + etcd-wrapper: + image: europe-docker.pkg.dev/gardener-project/releases/gardener/etcd-wrapper release: nextversion: 'bump_minor' slack: @@ -60,4 +67,3 @@ etcd-wrapper: internal_scp_workspace: channel_name: 'C0177NLL8V9' # gardener-etcd slack_cfg_name: 'scp_workspace' - component_descriptor: ~