Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[fix] fix etcd-backup-restore based flavors #471

Merged
merged 1 commit into from
Aug 21, 2024
Merged

[fix] fix etcd-backup-restore based flavors #471

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions cloud/scope/object_storage_key.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ const (
apiVersion: v1
metadata:
name: %s
namespace: kube-system
stringData:
bucket_name: %s
bucket_region: %s
Expand Down
10 changes: 4 additions & 6 deletions docs/src/topics/backups.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down
6 changes: 3 additions & 3 deletions templates/addons/etcd-backup-restore/etcd-backup-restore.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down
Loading