tweak e2e test to deal with resource ordering

Author: AshleyDumaine

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

@@ -0,0 +1,11 @@
+apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2
+kind: LinodeObjectStorageBucket
+metadata:
+  name: ($bucket)
+spec:
+  region: us-sea
+  forceDeleteBucket: true
+  accessKeyRef:
+    name: ($bucket)
+status:
+  ready: true

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

@@ -0,0 +1,9 @@
+---
+apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2
+kind: LinodeObjectStorageBucket
+metadata:
+  name: ($bucket)
+spec:
+  region: us-sea
+status:
+  ready: true

…inodeobjectstoragebucket/assert-obj.yaml …eobjectstoragebucket/assert-lobjkey.yamle2e/linodeobjectstoragebucket-controller/force-delete-linodeobjectstoragebucket/assert-obj.yaml renamed to e2e/linodeobjectstoragebucket-controller/force-delete-linodeobjectstoragebucket/assert-lobjkey.yaml e2e/linodeobjectstoragebucket-controller/force-delete-linodeobjectstoragebucket/assert-obj.yaml renamed to e2e/linodeobjectstoragebucket-controller/force-delete-linodeobjectstoragebucket/assert-lobjkey.yaml

@@ -1,16 +1,3 @@
----
-apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2
-kind: LinodeObjectStorageBucket
-metadata:
-  name: ($bucket)
-spec:
-  region: us-sea
-  forceDeleteBucket: true
-  accessKeyRef:
-    name: ($bucket)
-status:
-  ready: true
----
 apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2
 kind: LinodeObjectStorageKey
 metadata:

e2e/linodeobjectstoragebucket-controller/force-delete-linodeobjectstoragebucket/chainsaw-test.yaml

@@ -28,9 +28,9 @@ spec:
     - name: Create LinodeObjectStorageBucket
       try:
         - apply:
-            file: create-linodeobjectstoragebucket.yaml
+            file: create-lobj.yaml
         - assert:
-            file: assert-obj.yaml
+            file: assert-lobj.yaml
       catch:
         - describe:
             apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2
@@ -51,6 +51,45 @@ 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:
+            env:
+              - name: URI
+                value: object-storage/keys
+              - name: OBJ_KEY
+                value: ($access_secret)
+            content: |
+              set -e
+
+              export KEY_ID=$(kubectl -n $NAMESPACE get lobjkey $OBJ_KEY -ojson | jq '.status.accessKeyRef')
+              
+              curl -s \
+                -H "Authorization: Bearer $LINODE_TOKEN" \
+                -H "Content-Type: application/json" \
+                "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:
@@ -59,7 +98,7 @@ spec:
               kind: LinodeObjectStorageBucket
               name: ($bucket)
         - error:
-            file: check-obj-deletion.yaml
+            file: check-lobj-deletion.yaml
     - name: Check if the bucket was deleted
       try:
         - script:
@@ -76,3 +115,12 @@ spec:
               ($error): ~
               (json_parse($stdout)):
                 results: 0
+    - name: Delete LinodeObjectStorageKey
+      try:
+        - delete:
+            ref:
+              apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2
+              kind: LinodeObjectStorageKey
+              name: ($bucket)
+        - error:
+            file: check-lobjkey-deletion.yaml

e2e/linodeobjectstoragebucket-controller/force-delete-linodeobjectstoragebucket/check-obj-deletion.yaml

@@ -0,0 +1,6 @@
+apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2
+kind: LinodeObjectStorageBucket
+metadata:
+  name: ($bucket)
+spec:
+  region: us-sea

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

@@ -1,14 +1,4 @@
 apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2
-kind: LinodeObjectStorageBucket
-metadata:
-  name: ($bucket)
-spec:
-  region: us-sea
-  forceDeleteBucket: true
-  accessKeyRef:
-    name: ($bucket)
----
-apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2
 kind: LinodeObjectStorageKey
 metadata:
   name: ($bucket)

…et/create-linodeobjectstoragebucket.yaml …eobjectstoragebucket/create-lobjkey.yamle2e/linodeobjectstoragebucket-controller/force-delete-linodeobjectstoragebucket/create-linodeobjectstoragebucket.yaml renamed to e2e/linodeobjectstoragebucket-controller/force-delete-linodeobjectstoragebucket/create-lobjkey.yaml e2e/linodeobjectstoragebucket-controller/force-delete-linodeobjectstoragebucket/create-linodeobjectstoragebucket.yaml renamed to e2e/linodeobjectstoragebucket-controller/force-delete-linodeobjectstoragebucket/create-lobjkey.yaml

@@ -0,0 +1,9 @@
+apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2
+kind: LinodeObjectStorageBucket
+metadata:
+  name: ($bucket)
+spec:
+  region: us-sea
+  forceDeleteBucket: true
+  accessKeyRef:
+    name: ($bucket)