shorten cluster obj store resource names

Author: eljohnson92

e2e/linodemachine-controller/cluster-object-store/chainsaw-test.yaml

@@ -2,7 +2,7 @@
 apiVersion: chainsaw.kyverno.io/v1alpha1
 kind: Test
 metadata:
-  name: cluster-object-store
+  name: cluster-obj
   # Label to trigger the test on every PR
   labels:
     all:
@@ -11,14 +11,14 @@ spec:
   bindings:
     # A short identifier for the E2E test run
     - name: run
-      value: (join('-', ['e2e', 'cluster-obj-store', random('[0-9a-z]{7}')]))
+      value: (join('-', ['cluster-obj', random('[0-9a-z]{7}')]))
     - name: cluster
       # Format the cluster name
       value: (trim((truncate(($run), `29`)), '-'))
     - name: key
       # Format the key name into a valid Kubernetes object name
       # TODO: This is over-truncated to account for the Kubernetes access key Secret
-      value: (trim((truncate((join('-', [($cluster), 'object-store'])), `52`)), '-'))
+      value: (trim((truncate((join('-', [($cluster)])), `52`)), '-'))
     - name: key_secret
       value: (concat(($key), '-obj-key'))
   template: true

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

@@ -4,17 +4,17 @@ kind: LinodeObjectStorageBucket
 metadata:
   labels:
     app.kubernetes.io/name: linodeobjectstoragebucket
-    app.kubernetes.io/instance: ${CLUSTER_NAME}-object-store
+    app.kubernetes.io/instance: ${CLUSTER_NAME}
     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
+  name: ${CLUSTER_NAME}
 spec:
   credentialsRef:
     name: ${CLUSTER_NAME}-credentials
   accessKeyRef:
-    name: ${CLUSTER_NAME}-object-store-mgmt
+    name: ${CLUSTER_NAME}-mgmt
   forceDeleteBucket: ${FORCE_DELETE_OBJ_BUCKETS:=false}
   region: ${OBJ_BUCKET_REGION:=${LINODE_REGION}}
 ---
@@ -23,17 +23,17 @@ kind: LinodeObjectStorageKey
 metadata:
   labels:
     app.kubernetes.io/name: linodeobjectstoragekey
-    app.kubernetes.io/instance: ${CLUSTER_NAME}-object-store
+    app.kubernetes.io/instance: ${CLUSTER_NAME}
     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
+  name: ${CLUSTER_NAME}
 spec:
   credentialsRef:
     name: ${CLUSTER_NAME}-credentials
   bucketAccess:
-    - bucketName: ${CLUSTER_NAME}-object-store
+    - bucketName: ${CLUSTER_NAME}
       permissions: read_write
       region: ${OBJ_BUCKET_REGION:=${LINODE_REGION}}
   generatedSecret:
@@ -49,15 +49,15 @@ kind: LinodeObjectStorageKey
 metadata:
   labels:
     app.kubernetes.io/created-by: cluster-api-provider-linode
-    app.kubernetes.io/instance: ${CLUSTER_NAME}-object-store
+    app.kubernetes.io/instance: ${CLUSTER_NAME}
     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
+  name: ${CLUSTER_NAME}-mgmt
 spec:
   bucketAccess:
-    - bucketName: ${CLUSTER_NAME}-object-store
+    - bucketName: ${CLUSTER_NAME}
       permissions: read_write
       region: ${OBJ_BUCKET_REGION:=${LINODE_REGION}}
   credentialsRef: