From 648700126508b16ab423d5872ffab5705b0bcf8b Mon Sep 17 00:00:00 2001 From: Christian Cwienk Date: Thu, 25 Jan 2024 09:50:17 +0100 Subject: [PATCH 1/2] cleanup: rm obsolete/redundant attributes --- .ci/pipeline_definitions | 2 -- 1 file changed, 2 deletions(-) diff --git a/.ci/pipeline_definitions b/.ci/pipeline_definitions index dba2555a2aa8..ae086b23a61a 100644 --- a/.ci/pipeline_definitions +++ b/.ci/pipeline_definitions @@ -1,5 +1,4 @@ autoscaler: - template: 'default' base_definition: repo: source_labels: @@ -31,7 +30,6 @@ autoscaler: source: ~ # default steps: build: ~ - registry: 'gcr-readwrite' image: 'eu.gcr.io/gardener-project/gardener/autoscaler/cluster-autoscaler' dockerfile: './cluster-autoscaler/Dockerfile' steps: From 86a1565aba54d7da6490db0e0b732d3c464d9a7e Mon Sep 17 00:00:00 2001 From: Christian Cwienk Date: Thu, 7 Dec 2023 23:02:43 +0100 Subject: [PATCH 2/2] 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-gc --- .ci/pipeline_definitions | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/.ci/pipeline_definitions b/.ci/pipeline_definitions index ae086b23a61a..9c1b76834a03 100644 --- a/.ci/pipeline_definitions +++ b/.ci/pipeline_definitions @@ -18,6 +18,8 @@ autoscaler: 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: @@ -30,7 +32,7 @@ autoscaler: source: ~ # default steps: build: ~ - image: 'eu.gcr.io/gardener-project/gardener/autoscaler/cluster-autoscaler' + image: europe-docker.pkg.dev/gardener-project/snapshots/gardener/autoscaler/cluster-autoscaler dockerfile: './cluster-autoscaler/Dockerfile' steps: test: @@ -42,7 +44,8 @@ autoscaler: head-update: traits: component_descriptor: - ocm_repository: gardener-public + ocm_repository_mappings: + - repository: europe-docker.pkg.dev/gardener-project/releases draft_release: ~ pull-request: traits: @@ -51,6 +54,12 @@ autoscaler: traits: version: preprocess: 'finalize' + component_descriptor: + ocm_repository: europe-docker.pkg.dev/gardener-project/releases + publish: + dockerimages: + cluster-autoscaler: + image: europe-docker.pkg.dev/gardener-project/releases/gardener/autoscaler/cluster-autoscaler release: nextversion: 'bump_minor' slack: @@ -59,4 +68,3 @@ autoscaler: internal_scp_workspace: channel_name: 'C0170QTBJUW' # gardener-mcm slack_cfg_name: 'scp_workspace' - component_descriptor: ~