update template for enabling force deletion of object-storage bucket (#797)

Author: AshleyDumaine

templates/addons/cluster-object-store/cluster-object-store.yaml

@@ -2,42 +2,70 @@
 apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2
 kind: LinodeObjectStorageBucket
 metadata:
-    labels:
-        app.kubernetes.io/name: linodeobjectstoragebucket
-        app.kubernetes.io/instance: ${CLUSTER_NAME}-object-store
-        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}-object-store
+  labels:
+    app.kubernetes.io/name: linodeobjectstoragebucket
+    app.kubernetes.io/instance: ${CLUSTER_NAME}-object-store
+    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}-object-store
 spec:
-    credentialsRef:
-        name: ${CLUSTER_NAME}-credentials
-    region: ${OBJ_BUCKET_REGION:=${LINODE_REGION}}
-    forceDeleteBucket: ${FORCE_DELETE_OBJ_BUCKETS:=false}
+  credentialsRef:
+    name: ${CLUSTER_NAME}-credentials
+  accessKeyRef:
+    name: ${CLUSTER_NAME}-object-store-mgmt
+  forceDeleteBucket: ${FORCE_DELETE_OBJ_BUCKETS:=false}
+  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}-object-store
-        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}-object-store
+  labels:
+    app.kubernetes.io/name: linodeobjectstoragekey
+    app.kubernetes.io/instance: ${CLUSTER_NAME}-object-store
+    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}-object-store
 spec:
-    credentialsRef:
-        name: ${CLUSTER_NAME}-credentials
-    bucketAccess:
-        - bucketName: ${CLUSTER_NAME}-object-store
-          permissions: read_write
-          region: ${OBJ_BUCKET_REGION:=${LINODE_REGION}}
-    generatedSecret:
-        type: Opaque
-        format:
-            bucket: '{{ .BucketName }}'
-            endpoint: '{{ .S3Endpoint }}'
-            access: '{{ .AccessKey }}'
-            secret: '{{ .SecretKey }}'
+  credentialsRef:
+    name: ${CLUSTER_NAME}-credentials
+  bucketAccess:
+    - bucketName: ${CLUSTER_NAME}-object-store
+      permissions: read_write
+      region: ${OBJ_BUCKET_REGION:=${LINODE_REGION}}
+  generatedSecret:
+    type: Opaque
+    format:
+      bucket: '{{ .BucketName }}'
+      endpoint: '{{ .S3Endpoint }}'
+      access: '{{ .AccessKey }}'
+      secret: '{{ .SecretKey }}'
+---
+apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2
+kind: LinodeObjectStorageKey
+metadata:
+  labels:
+    app.kubernetes.io/created-by: cluster-api-provider-linode
+    app.kubernetes.io/instance: ${CLUSTER_NAME}-object-store
+    app.kubernetes.io/managed-by: kustomize
+    app.kubernetes.io/name: linodeobjectstoragekey
+    app.kubernetes.io/part-of: cluster-api-provider-linode
+    cluster.x-k8s.io/cluster-name: ${CLUSTER_NAME}
+  name: ${CLUSTER_NAME}-object-store-mgmt
+spec:
+  bucketAccess:
+    - bucketName: ${CLUSTER_NAME}-object-store
+      permissions: read_write
+      region: ${OBJ_BUCKET_REGION:=${LINODE_REGION}}
+  credentialsRef:
+    name: ${CLUSTER_NAME}-credentials
+  generatedSecret:
+    format:
+      access: '{{ .AccessKey }}'
+      bucket: '{{ .BucketName }}'
+      endpoint: '{{ .S3Endpoint }}'
+      secret: '{{ .SecretKey }}'
+    type: Opaque

templates/addons/etcd-backup-restore/linode-obj.yaml

@@ -29,7 +29,6 @@ metadata:
     app.kubernetes.io/part-of: cluster-api-provider-linode
     cluster.x-k8s.io/cluster-name: ${CLUSTER_NAME}
   name: ${CLUSTER_NAME}-etcd-backup-mgmt
-  namespace: default
 spec:
   bucketAccess:
     - bucketName: ${CLUSTER_NAME}-etcd-backup