rework finicky chainsaw test

Author: AshleyDumaine

e2e/linodeobjectstoragebucket-controller/force-delete-linodeobjectstoragebucket/assert-accessref.yaml

@@ -25,16 +25,30 @@ spec:
       try:
         - assert:
             file: assert-capi-resources.yaml
-    - name: Create LinodeObjectStorageBucket
+    - name: Create LinodeObjectStorageBucket and Key
       try:
         - apply:
-            file: create-lobj.yaml
-        - assert:
-            file: assert-lobj.yaml
-      catch:
-        - describe:
+            file: create-bucket-and-key.yaml
+    - name: Wait for the bucket and key to be ready
+      try:
+        - wait:
             apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2
             kind: LinodeObjectStorageBucket
+            name: ($bucket)
+            timeout: 1m
+            for:
+              condition:
+                name: Ready
+                value: 'true'
+        - wait:
+            apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2
+            kind: LinodeObjectStorageKey
+            name: ($access_secret)
+            timeout: 1m
+            for:
+              condition:
+                name: Ready
+                value: 'true'
     - name: Check if the bucket was created
       try:
         - script:
@@ -51,16 +65,6 @@ spec:
               ($error): ~
               (json_parse($stdout)):
                 label: ($bucket)
-    - name: Create LinodeObjectStorageKey
-      try:
-        - apply:
-            file: create-lobjkey.yaml
-        - assert:
-            file: assert-lobjkey.yaml
-      catch:
-        - describe:
-            apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2
-            kind: LinodeObjectStorageKey
     - name: Ensure the access key was created
       try:
         - script:
@@ -80,16 +84,6 @@ spec:
                 "https://api.linode.com/v4/$URI/$KEY_ID"
             check:
               ($error): ~
-    - name: Set access key on LinodeObjectStorageBucket
-      try:
-        - apply:
-            file: set-accessref.yaml
-        - assert:
-            file: assert-accessref.yaml
-      catch:
-        - describe:
-            apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2
-            kind: LinodeObjectStorageBucket
     - name: Delete LinodeObjectStorageBucket
       try:
         - delete:

e2e/linodeobjectstoragebucket-controller/force-delete-linodeobjectstoragebucket/assert-lobj.yaml

@@ -1,16 +1,27 @@
+---
+apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2
+kind: LinodeObjectStorageBucket
+metadata:
+  name: ($bucket)
+spec:
+  accessKeyRef:
+    name: ($bucket)
+  forceDeleteBucket: true
+  region: us-sea
+---
 apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2
 kind: LinodeObjectStorageKey
 metadata:
   name: ($bucket)
 spec:
   bucketAccess:
-    - bucketName: ($bucket)
-      permissions: read_write
-      region: us-sea
+  - bucketName: ($bucket)
+    permissions: read_write
+    region: us-sea
   generatedSecret:
-    name: ($access_secret)
     format:
+      access: '{{ .AccessKey }}'
       bucket: '{{ .BucketName }}'
       endpoint: '{{ .S3Endpoint }}'
-      access: '{{ .AccessKey }}'
       secret: '{{ .SecretKey }}'
+    type: Opaque