[hotfix-v0.21] Cherry-pick essential PRs and bug fixes (#756)

* switch GCR -> Artifact-Registry (#735) * Fix artifact registry issue to push dev images to europe-docker.pkg.dev/gardener-project/snapshots (#745) * Update the etcd-backup-restore images with lastest releases (#752) v0.24.7 -> v0.24.8 v0.27.0 -> v0.28.0 --------- Co-authored-by: Christian Cwienk <christian.cwienk@sap.com> Co-authored-by: Ishan Tyagi <42602577+ishan16696@users.noreply.github.com>
gardener · Jan 11, 2024 · 51e9b28 · 51e9b28
1 parent 83c84c7
commit 51e9b28
Show file tree

Hide file tree

Showing 12 changed files with 37 additions and 32 deletions.
diff --git a/.ci/pipeline_definitions b/.ci/pipeline_definitions
@@ -1,21 +1,20 @@
 etcd-druid:
-  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:
         - linux/amd64
         - linux/arm64
         dockerimages:
           etcd-druid:
-            registry: 'gcr-readwrite'
-            image: 'eu.gcr.io/gardener-project/gardener/etcd-druid'
+            image: europe-docker.pkg.dev/gardener-project/snapshots/gardener/etcd-druid
             dockerfile: 'Dockerfile'
             inputs:
               repos:
@@ -46,15 +45,22 @@ etcd-druid:
     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: ~
-        component_descriptor: ~
     release:
       traits:
         version:
           preprocess: 'finalize'
+        component_descriptor:
+          ocm_repository: europe-docker.pkg.dev/gardener-project/releases
+        publish:
+          dockerimages:
+            etcd-druid:
+              image: europe-docker.pkg.dev/gardener-project/releases/gardener/etcd-druid
         release:
           nextversion: 'bump_minor'
           git_tags:
@@ -66,4 +72,3 @@ etcd-druid:
             internal_scp_workspace:
               channel_name: 'C0177NLL8V9' # gardener-etcd
               slack_cfg_name: 'scp_workspace'
-        component_descriptor: ~
diff --git a/Makefile b/Makefile
@@ -15,8 +15,8 @@
 # Image URL to use all building/pushing image targets
 VERSION             := $(shell cat VERSION)
 REPO_ROOT           := $(shell dirname "$(realpath $(lastword $(MAKEFILE_LIST)))")
-REGISTRY            := eu.gcr.io/gardener-project/gardener
-IMAGE_REPOSITORY    := $(REGISTRY)/etcd-druid
+REGISTRY            := europe-docker.pkg.dev/gardener-project/snapshots
+IMAGE_REPOSITORY    := $(REGISTRY)/gardener/etcd-druid
 IMAGE_BUILD_TAG     := $(VERSION)
 BUILD_DIR           := build
 PROVIDERS           := ""
@@ -155,7 +155,7 @@ update-dependencies:
 .PHONY: add-license-headers
 add-license-headers: $(GO_ADD_LICENSE)
 	@./hack/addlicenseheaders.sh ${YEAR}
-	
+
 .PHONY: kind-up
 kind-up: $(KIND)
 	@printf "\n\033[0;33m📌 NOTE: To target the newly created KinD cluster, please run the following command:\n\n    export KUBECONFIG=$(KUBECONFIG_PATH)\n\033[0m\n"

diff --git a/README.md b/README.md
@@ -51,7 +51,7 @@ spec:
     fullSnapshotSchedule: 0 */24 * * *
     garbageCollectionPeriod: 43200s
     garbageCollectionPolicy: Exponential
-    imageRepository: eu.gcr.io/gardener-project/gardener/etcdbrctl
+    imageRepository: europe-docker.pkg.dev/gardener-project/public/gardener/etcdbrctl
     imageVersion: v0.25.0
     port: 8080
     resources:
@@ -67,7 +67,7 @@ spec:
     clientPort: 2379
     defragmentationSchedule: 0 */24 * * *
     enableTLS: false
-    imageRepository: eu.gcr.io/gardener-project/gardener/etcd-wrapper
+    imageRepository: europe-docker.pkg.dev/gardener-project/public/gardener/etcd-wrapper
     imageVersion: v0.1.0
     initialClusterState: new
     initialClusterToken: new

diff --git a/api/v1alpha1/types_etcd_test.go b/api/v1alpha1/types_etcd_test.go
@@ -168,8 +168,8 @@ func getEtcd(name, namespace string) *Etcd {
 	deltaSnapshotPeriod := metav1.Duration{
 		Duration: 300 * time.Second,
 	}
-	imageEtcd := "eu.gcr.io/gardener-project/gardener/etcd-wrapper:v0.1.0"
-	imageBR := "eu.gcr.io/gardener-project/gardener/etcdbrctl:v0.25.0"
+	imageEtcd := "europe-docker.pkg.dev/gardener-project/public/gardener/etcd-wrapper:v0.1.0"
+	imageBR := "europe-docker.pkg.dev/gardener-project/public/gardener/etcdbrctl:v0.25.0"
 	snapshotSchedule := "0 */24 * * *"
 	defragSchedule := "0 */24 * * *"
 	container := "my-object-storage-container-name"

diff --git a/charts/druid/values.yaml b/charts/druid/values.yaml
@@ -1,7 +1,7 @@
 crds:
   enabled: true
 image:
-  repository: eu.gcr.io/gardener-project/gardener/etcd-druid
+  repository: europe-docker.pkg.dev/gardener-project/public/gardener/etcd-druid
   tag: latest
   imagePullPolicy: IfNotPresent
 replicas: 1

diff --git a/charts/images.yaml b/charts/images.yaml
@@ -3,22 +3,22 @@ images:
   resourceId:
     name: 'etcdbrctl'
   sourceRepository: github.com/gardener/etcd-backup-restore
-  repository: eu.gcr.io/gardener-project/gardener/etcdbrctl
-  tag: "v0.24.7"
+  repository: europe-docker.pkg.dev/gardener-project/public/gardener/etcdbrctl
+  tag: "v0.24.8"
 - name: etcd
   sourceRepository: github.com/gardener/etcd-custom-image
-  repository: eu.gcr.io/gardener-project/gardener/etcd
+  repository: europe-docker.pkg.dev/gardener-project/public/gardener/etcd
   tag: "v3.4.26-3"
 - name: etcd-backup-restore-distroless
   resourceId:
     name: 'etcdbrctl'
   sourceRepository: github.com/gardener/etcd-backup-restore
-  repository: eu.gcr.io/gardener-project/gardener/etcdbrctl
-  tag: "v0.27.0"
+  repository: europe-docker.pkg.dev/gardener-project/public/gardener/etcdbrctl
+  tag: "v0.28.0"
 - name: etcd-wrapper
   sourceRepository: github.com/gardener/etcd-wrapper
-  repository: eu.gcr.io/gardener-project/gardener/etcd-wrapper
+  repository: europe-docker.pkg.dev/gardener-project/public/gardener/etcd-wrapper
   tag: "v0.1.0"
 - name: alpine
-  repository: eu.gcr.io/gardener-project/3rd/alpine
+  repository: europe-docker.pkg.dev/gardener-project/public/3rd/alpine
   tag: "3.18.4"
diff --git a/config/default/manager_image_patch.yaml b/config/default/manager_image_patch.yaml
@@ -8,5 +8,5 @@ spec:
     spec:
       containers:
         # Change the value of image field below to your controller image URL
-        - image: eu.gcr.io/gardener-project/gardener/etcd-druid:v0.21.0
+        - image: europe-docker.pkg.dev/gardener-project/public/gardener/etcd-druid:v0.21.0
           name: druid
diff --git a/pkg/component/etcd/statefulset/statefulset_test.go b/pkg/component/etcd/statefulset/statefulset_test.go
@@ -62,9 +62,9 @@ var (
 	backupPort              int32 = 8080
 	wrapperPort             int32 = 9095
 	uid                           = "a9b8c7d6e5f4"
-	imageEtcd                     = "eu.gcr.io/gardener-project/gardener/etcd-wrapper:v0.1.0"
-	imageBR                       = "eu.gcr.io/gardener-project/gardener/etcdbrctl:v0.25.0"
-	imageInitContainer            = "eu.gcr.io/gardener-project/3rd/alpine:3.18.4"
+	imageEtcd                     = "europe-docker.pkg.dev/gardener-project/releases/gardener/etcd-wrapper:v0.1.0"
+	imageBR                       = "europe-docker.pkg.dev/gardener-project/releases/gardener/etcdbrctl:v0.25.0"
+	imageInitContainer            = "europe-docker.pkg.dev/gardener-project/releases/3rd/alpine:3.18.4"
 	snapshotSchedule              = "0 */24 * * *"
 	defragSchedule                = "0 */24 * * *"
 	container                     = "default.bkp"

diff --git a/skaffold.yaml b/skaffold.yaml
@@ -7,7 +7,7 @@ build:
   local:
     useBuildkit: true
   artifacts:
-  - image: eu.gcr.io/gardener-project/gardener/etcd-druid
+  - image: europe-docker.pkg.dev/gardener-project/public/gardener/etcd-druid
     docker:
       dockerfile: Dockerfile
       target: druid
@@ -18,7 +18,7 @@ deploy:
       chartPath: charts/druid
       namespace: default
       artifactOverrides:
-        image: eu.gcr.io/gardener-project/gardener/etcd-druid
+        image: europe-docker.pkg.dev/gardener-project/public/gardener/etcd-druid
       imageStrategy:
         helm: {}
       skipBuildDependencies: true

diff --git a/test/integration/controllers/compaction/reconciler_test.go b/test/integration/controllers/compaction/reconciler_test.go
@@ -664,7 +664,7 @@ func createCompactionJob(instance *druidv1alpha1.Etcd) *batchv1.Job {
 					Containers: []corev1.Container{
 						{
 							Name:    "compact-backup",
-							Image:   "eu.gcr.io/gardener-project/3rd/alpine:3.18.4",
+							Image:   "europe-docker.pkg.dev/gardener-project/releases/3rd/alpine:3.18.4",
 							Command: []string{"sh", "-c", "tail -f /dev/null"},
 						},
 					},

diff --git a/test/utils/etcd.go b/test/utils/etcd.go
@@ -40,8 +40,8 @@ var (
 	clientPort              int32 = 2379
 	serverPort              int32 = 2380
 	backupPort              int32 = 8080
-	imageEtcd                     = "eu.gcr.io/gardener-project/gardener/etcd-wrapper:v0.1.0"
-	imageBR                       = "eu.gcr.io/gardener-project/gardener/etcdbrctl:v0.25.0"
+	imageEtcd                     = "europe-docker.pkg.dev/gardener-project/public/gardener/etcd-wrapper:v0.1.0"
+	imageBR                       = "europe-docker.pkg.dev/gardener-project/public/gardener/etcdbrctl:v0.25.0"
 	snapshotSchedule              = "0 */24 * * *"
 	defragSchedule                = "0 */24 * * *"
 	container                     = "default.bkp"

diff --git a/test/utils/etcdcopybackupstask.go b/test/utils/etcdcopybackupstask.go
@@ -102,7 +102,7 @@ func CreateEtcdCopyBackupsJob(taskName, namespace string) *batchv1.Job {
 					Containers: []corev1.Container{
 						{
 							Name:            "copy-backups",
-							Image:           "eu.gcr.io/gardener-project/gardener/etcdbrctl",
+							Image:           "europe-docker.pkg.dev/gardener-project/public/gardener/etcdbrctl",
 							ImagePullPolicy: corev1.PullIfNotPresent,
 							Args:            []string{"copy"}, // since this is only used for testing the command here is not complete.
 						},