[feat] Update etcd-backup flavor to use LinodeObjectStorageKey (#448)

Author: bcm820

Diff for: config/rbac/role.yaml

@@ -10,6 +10,7 @@ rules:
   - events
   verbs:
   - create
+  - delete
   - get
   - list
   - patch

Diff for: controller/linodeobjectstoragebucket_controller.go

@@ -143,6 +143,7 @@ func (r *LinodeObjectStorageBucketReconciler) reconcileApply(ctx context.Context
 	bScope.Logger.Info("Reconciling apply")
 
 	bScope.Bucket.Status.Ready = false
+	bScope.Bucket.Status.FailureMessage = nil
 
 	bucket, err := services.EnsureObjectStorageBucket(ctx, bScope)
 	if err != nil {

Diff for: controller/linodeobjectstoragebucket_controller_test.go

@@ -104,6 +104,7 @@ var _ = Describe("lifecycle", Ordered, Label("bucket", "lifecycle"), func() {
 					By("status")
 					Expect(k8sClient.Get(ctx, objectKey, &obj)).To(Succeed())
 					Expect(obj.Status.Ready).To(BeTrue())
+					Expect(obj.Status.FailureMessage).To(BeNil())
 					Expect(obj.Status.Conditions).To(HaveLen(1))
 					Expect(obj.Status.Conditions[0].Type).To(Equal(clusterv1.ReadyCondition))
 					Expect(*obj.Status.Hostname).To(Equal("hostname"))

Diff for: controller/linodeobjectstoragekey_controller.go

@@ -66,7 +66,7 @@ type LinodeObjectStorageKeyReconciler struct {
 // +kubebuilder:rbac:groups=infrastructure.cluster.x-k8s.io,resources=linodeobjectstoragekeys/status,verbs=get;update;patch
 // +kubebuilder:rbac:groups=infrastructure.cluster.x-k8s.io,resources=linodeobjectstoragekeys/finalizers,verbs=update
 
-// +kubebuilder:rbac:groups="",resources=events,verbs=get;list;watch;create;update;patch
+// +kubebuilder:rbac:groups="",resources=events,verbs=get;list;watch;create;update;patch;delete
 // +kubebuilder:rbac:groups="",resources=secrets;,verbs=get;list;watch;create;update;patch;delete
 
 // Reconcile is part of the main kubernetes reconciliation loop which aims to
@@ -148,6 +148,7 @@ func (r *LinodeObjectStorageKeyReconciler) reconcileApply(ctx context.Context, k
 	keyScope.Logger.Info("Reconciling apply")
 
 	keyScope.Key.Status.Ready = false
+	keyScope.Key.Status.FailureMessage = nil
 
 	var keyForSecret *linodego.ObjectStorageKey
 

Diff for: controller/linodeobjectstoragekey_controller_test.go

@@ -119,6 +119,7 @@ var _ = Describe("lifecycle", Ordered, Label("key", "lifecycle"), func() {
 					By("status")
 					Expect(k8sClient.Get(ctx, objectKey, &key)).To(Succeed())
 					Expect(key.Status.Ready).To(BeTrue())
+					Expect(key.Status.FailureMessage).To(BeNil())
 					Expect(key.Status.Conditions).To(HaveLen(1))
 					Expect(key.Status.Conditions[0].Type).To(Equal(clusterv1.ReadyCondition))
 					Expect(key.Status.CreationTime).NotTo(BeNil())

Diff for: docs/src/topics/etcd.md

@@ -34,7 +34,7 @@ This is currently under development and will be available for use once the upstr
 For eg:
 ```sh
 export CLUSTER_NAME=test
-export OBJ_BUCKET_REGION=us-ord-1
+export OBJ_BUCKET_REGION=us-ord
 export ETCDBR_IMAGE=docker.io/username/your-custom-image:version
 export SSE_KEY=cdQdZ3PrKgm5vmqxeqwQCuAWJ7pPVyHg
 clusterctl generate cluster $CLUSTER_NAME \

Diff for: envrc.example

@@ -19,7 +19,7 @@ export LINODE_CONTROL_PLANE_MACHINE_TYPE="" # g6-standard-2
 export LINODE_MACHINE_TYPE="" # g6-standard-2
 
 # To set up etcd backup and restore
-export OBJ_BUCKET_REGION="" # us-ord-1
+export OBJ_BUCKET_REGION="" # us-ord
 export ETCDBR_IMAGE="" # docker.io/amoldeodhar/etcdbrctl:a7fc188f71977deabce6e4b2284e145d78000c30
 export SSE_KEY="" # cdQdZ3PrKgm5vmqxeqwQCuAWJ7pPVyHg
 

Diff for: templates/addons/etcd-backup-restore/etcd-backup-restore.yaml

@@ -46,27 +46,27 @@ data:
             - name: "AWS_REGION"
               valueFrom:
                 secretKeyRef:
-                  name: etcd-backup
+                  name: ${CLUSTER_NAME}-etcd-backup-obj-key
                   key: "bucket_region"
             - name: "BUCKET_NAME"
               valueFrom:
                 secretKeyRef:
-                  name: etcd-backup
+                  name: ${CLUSTER_NAME}-etcd-backup-obj-key
                   key: "bucket_name"
             - name: "AWS_ENDPOINT"
               valueFrom:
                 secretKeyRef:
-                  name: etcd-backup
+                  name: ${CLUSTER_NAME}-etcd-backup-obj-key
                   key: "bucket_endpoint"
             - name: "AWS_ACCESS_KEY_ID"
               valueFrom:
                 secretKeyRef:
-                  name: etcd-backup
+                  name: ${CLUSTER_NAME}-etcd-backup-obj-key
                   key: "access_key_rw"
             - name: "AWS_SECRET_ACCESS_KEY"
               valueFrom:
                 secretKeyRef:
-                  name: etcd-backup
+                  name: ${CLUSTER_NAME}-etcd-backup-obj-key
                   key: "secret_key_rw"
             - name: "AWS_SSE_CUSTOMER_KEY"
               valueFrom:
@@ -116,7 +116,7 @@ data:
             - name: STORAGE_CONTAINER
               valueFrom:
                 secretKeyRef:
-                  name: etcd-backup
+                  name: ${CLUSTER_NAME}-etcd-backup-obj-key
                   key: "bucket_name"
             volumeMounts:
             - mountPath: ${CERTPATH}

Diff for: templates/addons/etcd-backup-restore/linode-obj.yaml

@@ -13,16 +13,34 @@ metadata:
 spec:
   region: ${OBJ_BUCKET_REGION:=${LINODE_REGION}}
 ---
+apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2
+kind: LinodeObjectStorageKey
+metadata:
+  labels:
+    app.kubernetes.io/name: linodeobjectstoragekey
+    app.kubernetes.io/instance: ${CLUSTER_NAME}-etcd-backup
+    app.kubernetes.io/part-of: cluster-api-provider-linode
+    app.kubernetes.io/managed-by: kustomize
+    app.kubernetes.io/created-by: cluster-api-provider-linode
+    cluster.x-k8s.io/cluster-name: ${CLUSTER_NAME}
+  name: ${CLUSTER_NAME}-etcd-backup
+spec:
+  secretType: addons.cluster.x-k8s.io/resource-set
+  bucketAccess:
+    - bucketName: ${CLUSTER_NAME}-etcd-backup
+      permissions: read_write
+      region: ${OBJ_BUCKET_REGION:=${LINODE_REGION}}
+---
 apiVersion: addons.cluster.x-k8s.io/v1beta1
 kind: ClusterResourceSet
 metadata:
-  name: ${CLUSTER_NAME}-etcd-backup-bucket-details
+  name: ${CLUSTER_NAME}-etcd-backup-obj-key
 spec:
   clusterSelector:
     matchLabels:
       etcd-backup: "true"
       cluster: ${CLUSTER_NAME}
   resources:
     - kind: Secret
-      name: ${CLUSTER_NAME}-etcd-backup-bucket-details
+      name: ${CLUSTER_NAME}-etcd-backup-obj-key
   strategy: ApplyOnce