Merge branch 'main' into dns.cleanup

linode · Aug 21, 2024 · e30e038 · e30e038
2 parents edcb049 + 56faeae
commit e30e038
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git 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
@@ -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: <unique-bucket-label>-bucket-details
+  name: <unique-bucket-label>-obj-key
   namespace: <same-namespace-as-object-storage-bucket>
   ownerReferences:
     - apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2
@@ -67,13 +67,11 @@ data:
   bucket_name: <unique-bucket-label>
   bucket_region: <linode-obj-bucket-region>
   bucket_endpoint: <hostname-to-access-bucket>
-  access_key_rw: <base64-encoded-access-key>
-  secret_key_rw: <base64-encoded-secret-key>
-  access_key_ro: <base64-encoded-access-key>
-  secret_key_ro: <base64-encoded-secret-key>
+  access_key: <base64-encoded-access-key>
+  secret_key: <base64-encoded-secret-key>
 ```
 
-The bucket-details secret is owned and managed by CAPL during the life of the `LinodeObjectStorageBucket`.
+The<unique-bucket-label>-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
@@ -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