Move from GCR to artifact registry (#10)

* switch GCR -> Artifact-Registry * Use correct version object
gardener · Mar 26, 2024 · 24edc50 · 24edc50
1 parent c43b206
commit 24edc50
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 39 deletions.
diff --git a/.ci/pipeline_definitions b/.ci/pipeline_definitions
@@ -7,6 +7,8 @@ gardener-custom-metrics:
   base_definition:
     repo: ~
     traits:
+      component_descriptor:
+        ocm_repository: europe-docker.pkg.dev/gardener-project/snapshots
       version:
         preprocess: 'inject-commit-hash'
       publish:
@@ -16,28 +18,33 @@ gardener-custom-metrics:
         - linux/arm64
         dockerimages:
           gardener-custom-metrics:
-            registry: 'gcr-readwrite'
-            image: 'eu.gcr.io/sap-se-gcp-scp-k8s/gardener/gardener-custom-metrics' # 'eu.gcr.io/gardener-project/gardener/gardener-custom-metrics'
+            image: 'europe-docker.pkg.dev/gardener-project/snapshots/gardener/gardener-custom-metrics'
             dockerfile: 'Dockerfile'
             target: gardener-custom-metrics
   jobs:
     head-update:
       traits:
-        component_descriptor: ~
+        component_descriptor:
+          ocm_repository_mappings:
+            - repository: europe-docker.pkg.dev/gardener-project/releases
         draft_release: ~
         options:
           public_build_logs: true
     pull-request:
       traits:
         pull-request: ~
-        component_descriptor: ~
+        component_descriptor:
+          ocm_repository_mappings:
+            - repository: europe-docker.pkg.dev/gardener-project/releases
         options:
           public_build_logs: true
     release:
       steps:
         verify:
           image: 'golang:1.22.1'
       traits:
+        component_descriptor:
+          ocm_repository: europe-docker.pkg.dev/gardener-project/releases
         version:
           preprocess: 'finalize'
         release:
@@ -50,8 +57,8 @@ gardener-custom-metrics:
 #            internal_scp_workspace:
 #              channel_name: 'C9CEBQPGE' #sap-tech-gardener
 #              slack_cfg_name: 'scp_workspace'
-        component_descriptor: ~
         publish:
           dockerimages:
             gardener-custom-metrics:
+              image: 'europe-docker.pkg.dev/gardener-project/releases/gardener/gardener-custom-metrics'
               tag_as_latest: true
diff --git a/Makefile b/Makefile
@@ -14,7 +14,7 @@
 
 BUILD_DATE                  := $(shell date '+%Y-%m-%dT%H:%M:%S%z' | sed 's/\([0-9][0-9]\)$$/:\1/g')
 NAME                        := gardener-custom-metrics
-IMAGE_REGISTRY_URI          := eu.gcr.io/gardener-project/gardener
+IMAGE_REGISTRY_URI          := europe-docker.pkg.dev/gardener-project/releases/gardener
 REPO_ROOT                   := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
 VERSION                     := $(shell cat "$(REPO_ROOT)/VERSION")
 EFFECTIVE_VERSION           := $(VERSION)-$(shell git rev-parse HEAD)

diff --git a/cmd/gardener-custom-metrics/main.go b/cmd/gardener-custom-metrics/main.go
@@ -11,6 +11,7 @@ import (
 	"go.uber.org/zap/zapcore"
 	genericapiserver "k8s.io/apiserver/pkg/server"
 	"k8s.io/component-base/logs"
+	"k8s.io/component-base/version"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 	kmgr "sigs.k8s.io/controller-runtime/pkg/manager"
@@ -21,7 +22,6 @@ import (
 	"github.com/gardener/gardener-custom-metrics/pkg/metrics_provider"
 	gutil "github.com/gardener/gardener-custom-metrics/pkg/util/gardener"
 	k8sclient "github.com/gardener/gardener-custom-metrics/pkg/util/k8s/client"
-	"github.com/gardener/gardener-custom-metrics/pkg/version"
 )
 
 func main() {
@@ -79,7 +79,7 @@ func completeAppCLIOptions(
 
 	// Create log
 	log := initLogs(ctx, appOptions.Completed().LogLevel)
-	log.V(app.VerbosityInfo).Info("Initializing", "version", version.Version)
+	log.V(app.VerbosityInfo).Info("Initializing", "version", version.Get().GitVersion)
 
 	// Create manager
 	log.V(app.VerbosityInfo).Info("Creating client set")

diff --git a/example/custom-metrics-deployment.yaml b/example/custom-metrics-deployment.yaml
@@ -42,7 +42,7 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
-          image: eu.gcr.io/gardener-project/gardener/gardener-custom-metrics:v0.10.9-dev
+          image: europe-docker.pkg.dev/gardener-project/releases/gardener/gardener-custom-metrics:v0.1.0-dev
           imagePullPolicy: IfNotPresent
           name: gardener-custom-metrics
           ports:

diff --git a/hack/gardener-util/.ci/component_descriptor b/hack/gardener-util/.ci/component_descriptor
@@ -4,7 +4,7 @@
 #
 # COMPONENT_PREFIXES: Set the image prefix that should be used to
 #                     determine if an image is defined by another component.
-#                     Defaults to "eu.gcr.io/gardener-project/gardener"
+#                     Defaults to "europe-docker.pkg.dev/gardener-project/releases/gardener"
 #
 # GENERIC_DEPENDENCIES: Set images that are generic dependencies with no specific tag.
 #                       Defaults to "hyperkube,kube-apiserver,kube-controller-manager,kube-scheduler,kube-proxy"
@@ -51,7 +51,7 @@ echo "Enriching component descriptor from ${BASE_DEFINITION_PATH}"
 if [[ -f "$repo_root_dir/charts/images.yaml" ]]; then
   # default environment variables
   if [[ -z "${COMPONENT_PREFIXES}" ]]; then
-    COMPONENT_PREFIXES="eu.gcr.io/gardener-project/gardener"
+    COMPONENT_PREFIXES="europe-docker.pkg.dev/gardener-project/releases/gardener"
   fi
   if [[ -z "${GENERIC_DEPENDENCIES}" ]]; then
     GENERIC_DEPENDENCIES="hyperkube,kube-apiserver,kube-controller-manager,kube-scheduler,kube-proxy"
@@ -89,10 +89,10 @@ if [[ -d "$repo_root_dir/charts/" ]]; then
       REPOSITORY=${imageAndTag[0]}
       TAG=${imageAndTag[1]}
 
-      gardener="eu.gcr.io/gardener-project/gardener"
+      gardener="europe-docker.pkg.dev/gardener-project/releases/gardener"
       if [[ "$NAME" == "hyperkube" ]]; then
         ${ADD_DEPENDENCIES_CMD} --generic-dependencies "{\"name\": \"$NAME\", \"version\": \"$TAG\"}"
-      elif [[ $REPOSITORY =~ "eu.gcr.io/gardener-project/gardener"* ]]; then
+      elif [[ $REPOSITORY =~ "europe-docker.pkg.dev/gardener-project/releases/gardener"* ]]; then
         ${ADD_DEPENDENCIES_CMD} --generic-dependencies "{\"name\": \"$NAME\", \"version\": \"$TAG\"}"
       else
         ${ADD_DEPENDENCIES_CMD} --container-image-dependencies "{\"name\": \"${NAME}\", \"image_reference\": \"${REPOSITORY}:${TAG}\", \"version\": \"$TAG\"}"

diff --git a/pkg/version/version.go b/pkg/version/version.go
diff --git a/skaffold.yaml b/skaffold.yaml
@@ -5,7 +5,7 @@ metadata:
   name: gardener-custom-metrics
 build:
   artifacts:
-    - image: eu.gcr.io/gardener-project/gardener/gardener-custom-metrics
+    - image: europe-docker.pkg.dev/gardener-project/releases/gardener/gardener-custom-metrics
       ko:
         dependencies:
           paths: