From 56faeae838f27a6b84915476b80d3a3c77f3f38b Mon Sep 17 00:00:00 2001 From: amold1 Date: Wed, 21 Aug 2024 10:19:43 -0400 Subject: [PATCH] fix etcd-backup-restore based flavors (#471) --- cloud/scope/object_storage_key.go | 1 + docs/src/topics/backups.md | 10 ++++------ .../etcd-backup-restore/etcd-backup-restore.yaml | 6 +++--- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/cloud/scope/object_storage_key.go b/cloud/scope/object_storage_key.go index 6158852b3..201da7560 100644 --- a/cloud/scope/object_storage_key.go +++ b/cloud/scope/object_storage_key.go @@ -107,6 +107,7 @@ const ( apiVersion: v1 metadata: name: %s + namespace: kube-system stringData: bucket_name: %s bucket_region: %s diff --git a/docs/src/topics/backups.md b/docs/src/topics/backups.md index 2660dcee1..33bb8d911 100644 --- a/docs/src/topics/backups.md +++ b/docs/src/topics/backups.md @@ -55,7 +55,7 @@ CAPL will also create `read_write` and `read_only` access keys for the bucket an apiVersion: v1 kind: Secret metadata: - name: -bucket-details + name: -obj-key namespace: ownerReferences: - apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2 @@ -67,13 +67,11 @@ data: bucket_name: bucket_region: bucket_endpoint: - access_key_rw: - secret_key_rw: - access_key_ro: - secret_key_ro: + access_key: + secret_key: ``` -The bucket-details secret is owned and managed by CAPL during the life of the `LinodeObjectStorageBucket`. +The-obj-key secret is owned and managed by CAPL during the life of the `LinodeObjectStorageBucket`. ### Access Keys Rotation diff --git a/templates/addons/etcd-backup-restore/etcd-backup-restore.yaml b/templates/addons/etcd-backup-restore/etcd-backup-restore.yaml index 67ef342a5..c47d572c9 100644 --- a/templates/addons/etcd-backup-restore/etcd-backup-restore.yaml +++ b/templates/addons/etcd-backup-restore/etcd-backup-restore.yaml @@ -62,12 +62,12 @@ data: valueFrom: secretKeyRef: name: ${CLUSTER_NAME}-etcd-backup-obj-key - key: "access_key_rw" + key: "access_key" - name: "AWS_SECRET_ACCESS_KEY" valueFrom: secretKeyRef: name: ${CLUSTER_NAME}-etcd-backup-obj-key - key: "secret_key_rw" + key: "secret_key" - name: "AWS_SSE_CUSTOMER_KEY" valueFrom: secretKeyRef: @@ -94,7 +94,7 @@ data: - --cacert=${CERTPATH}/etcd/${CACERTFILE} - --cert=${CERTPATH}/etcd/${CERTFILE} - --key=${CERTPATH}/etcd/${KEYFILE} - image: ${ETCDBR_IMAGE:-europe-docker.pkg.dev/gardener-project/releases/gardener/etcdbrctl:v0.28.0} + image: ${ETCDBR_IMAGE:-europe-docker.pkg.dev/gardener-project/releases/gardener/etcdbrctl:v0.29.0} securityContext: allowPrivilegeEscalation: false runAsUser: 0