Use prebuilt image to reduce start time of setup pod

Author: chenwng

internal/controllers/limit/tests/limit-create-full/00-setup-cleanup.yaml

@@ -16,18 +16,9 @@ spec:
     spec:
       containers:
         - name: setup-teardown
-          image: golang:alpine
+          image: ghcr.io/chenwng/orc-helper:latest
           command:
-            - sh
-            - -c
-            - |
-              mkdir /test-helper &&
-              cp /app/* /test-helper &&
-              cd /test-helper;
-              go mod init test-helper &&
-              go mod tidy &&
-              go build -o ./test-helper . &&
-              exec ./test-helper
+            - /orc-helper
           volumeMounts:
             - name: openstack-clouds
               mountPath: /etc/openstack

internal/controllers/limit/tests/limit-create-minimal/00-setup-cleanup.yaml

@@ -16,18 +16,9 @@ spec:
     spec:
       containers:
         - name: setup-teardown
-          image: golang:alpine
+          image: ghcr.io/chenwng/orc-helper:latest
           command:
-            - sh
-            - -c
-            - |
-              mkdir /test-helper &&
-              cp /app/* /test-helper &&
-              cd /test-helper;
-              go mod init test-helper &&
-              go mod tidy &&
-              go build -o ./test-helper . &&
-              exec ./test-helper
+            - /orc-helper
           volumeMounts:
             - name: openstack-clouds
               mountPath: /etc/openstack

internal/controllers/limit/tests/limit-dependency/01-setup-cleanup.yaml

@@ -16,18 +16,9 @@ spec:
     spec:
       containers:
         - name: setup-teardown
-          image: golang:alpine
+          image: ghcr.io/chenwng/orc-helper:latest
           command:
-            - sh
-            - -c
-            - |
-              mkdir /test-helper &&
-              cp /app/* /test-helper &&
-              cd /test-helper;
-              go mod init test-helper &&
-              go mod tidy &&
-              go build -o ./test-helper . &&
-              exec ./test-helper
+            - /orc-helper
           volumeMounts:
             - name: openstack-clouds
               mountPath: /etc/openstack

internal/controllers/limit/tests/limit-dependency/02-assert.yaml

@@ -1,29 +1,8 @@
 ---
-apiVersion: kuttl.dev/v1beta1
-kind: TestAssert
-resourceRefs:
-  - apiVersion: openstack.k-orc.cloud/v1alpha1
-    kind: Service
-    name: service-limit-dependency
-    ref: service
-  - apiVersion: openstack.k-orc.cloud/v1alpha1
-    kind: Project
-    name: project-limit-dependency
-    ref: project
-  - apiVersion: openstack.k-orc.cloud/v1alpha1
-    kind: Domain
-    name: domain-limit-dependency
-    ref: domain
-  - apiVersion: v1
-    kind: Secret
-    name: limit-dependency
-    ref: secret
-assertAll:
-  - celExpr: "service.metadata.deletionTimestamp != 0"
-  - celExpr: "'openstack.k-orc.cloud/limit' in service.metadata.finalizers"
-  - celExpr: "project.metadata.deletionTimestamp != 0"
-  - celExpr: "'openstack.k-orc.cloud/limit' in project.metadata.finalizers"
-  - celExpr: "domain.metadata.deletionTimestamp != 0"
-  - celExpr: "'openstack.k-orc.cloud/limit' in domain.metadata.finalizers"
-  - celExpr: "secret.metadata.deletionTimestamp != 0"
-  - celExpr: "'openstack.k-orc.cloud/limit' in secret.metadata.finalizers"
+apiVersion: openstack.k-orc.cloud/v1alpha1
+kind: Domain
+metadata:
+  name: domain-limit-dependency
+status:
+  resource:
+    enabled: false

internal/controllers/limit/tests/limit-dependency/02-disable-domain.yaml

@@ -0,0 +1,6 @@
+---
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+commands:
+  - command: kubectl patch domain domain-limit-dependency -p '{"spec":{"resource":{"enabled":false}}}' --type=merge
+    namespaced: true

internal/controllers/limit/tests/limit-dependency/03-assert.yaml

@@ -1,13 +1,29 @@
 ---
 apiVersion: kuttl.dev/v1beta1
 kind: TestAssert
-commands:
-  # Dependencies that were prevented deletion before should now be gone
-  - script: "! kubectl get service.openstack.k-orc.cloud service-limit-dependency --namespace $NAMESPACE"
-    skipLogOutput: true
-  - script: "! kubectl get project.openstack.k-orc.cloud project-limit-dependency --namespace $NAMESPACE"
-    skipLogOutput: true
-  - script: "! kubectl get domain.openstack.k-orc.cloud domain-limit-dependency --namespace $NAMESPACE"
-    skipLogOutput: true
-  - script: "! kubectl get secret limit-dependency --namespace $NAMESPACE"
-    skipLogOutput: true
+resourceRefs:
+  - apiVersion: openstack.k-orc.cloud/v1alpha1
+    kind: Service
+    name: service-limit-dependency
+    ref: service
+  - apiVersion: openstack.k-orc.cloud/v1alpha1
+    kind: Project
+    name: project-limit-dependency
+    ref: project
+  - apiVersion: openstack.k-orc.cloud/v1alpha1
+    kind: Domain
+    name: domain-limit-dependency
+    ref: domain
+  - apiVersion: v1
+    kind: Secret
+    name: limit-dependency
+    ref: secret
+assertAll:
+  - celExpr: "service.metadata.deletionTimestamp != 0"
+  - celExpr: "'openstack.k-orc.cloud/limit' in service.metadata.finalizers"
+  - celExpr: "project.metadata.deletionTimestamp != 0"
+  - celExpr: "'openstack.k-orc.cloud/limit' in project.metadata.finalizers"
+  - celExpr: "domain.metadata.deletionTimestamp != 0"
+  - celExpr: "'openstack.k-orc.cloud/limit' in domain.metadata.finalizers"
+  - celExpr: "secret.metadata.deletionTimestamp != 0"
+  - celExpr: "'openstack.k-orc.cloud/limit' in secret.metadata.finalizers"

…t-dependency/02-delete-dependencies.yaml …t-dependency/03-delete-dependencies.yamlinternal/controllers/limit/tests/limit-dependency/02-delete-dependencies.yaml renamed to internal/controllers/limit/tests/limit-dependency/03-delete-dependencies.yaml internal/controllers/limit/tests/limit-dependency/02-delete-dependencies.yaml renamed to internal/controllers/limit/tests/limit-dependency/03-delete-dependencies.yaml

@@ -2,8 +2,6 @@
 apiVersion: kuttl.dev/v1beta1
 kind: TestStep
 commands:
-  # Sleep 1 sec to avoid race condition that the controller only reconciles on the deletion operation due to the async processing and cache
-  - script: kubectl patch domain domain-limit-dependency -p '{"spec":{"resource":{"enabled":false}}}' --type=merge -n $NAMESPACE && sleep 1
   # We expect the deletion to hang due to the finalizer, so use --wait=false
   - command: kubectl delete service.openstack.k-orc.cloud,project,domain -l test-case=limit-dependency --wait=false
     namespaced: true

internal/controllers/limit/tests/limit-dependency/04-assert.yaml

@@ -0,0 +1,13 @@
+---
+apiVersion: kuttl.dev/v1beta1
+kind: TestAssert
+commands:
+  # Dependencies that were prevented deletion before should now be gone
+  - script: "! kubectl get service.openstack.k-orc.cloud service-limit-dependency --namespace $NAMESPACE"
+    skipLogOutput: true
+  - script: "! kubectl get project.openstack.k-orc.cloud project-limit-dependency --namespace $NAMESPACE"
+    skipLogOutput: true
+  - script: "! kubectl get domain.openstack.k-orc.cloud domain-limit-dependency --namespace $NAMESPACE"
+    skipLogOutput: true
+  - script: "! kubectl get secret limit-dependency --namespace $NAMESPACE"
+    skipLogOutput: true

…imit-dependency/03-delete-resources.yaml …imit-dependency/04-delete-resources.yamlinternal/controllers/limit/tests/limit-dependency/03-delete-resources.yaml renamed to internal/controllers/limit/tests/limit-dependency/04-delete-resources.yaml internal/controllers/limit/tests/limit-dependency/03-delete-resources.yaml renamed to internal/controllers/limit/tests/limit-dependency/04-delete-resources.yaml

@@ -10,8 +10,12 @@ Create the missing dependencies and verify all the Limits are available.
 
 ## Step 02
 
-Delete all the dependencies and check that ORC prevents deletion since there is still a resource that depends on them.
+Disable domain to facilitate the deletion.
 
 ## Step 03
 
+Delete all the dependencies and check that ORC prevents deletion since there is still a resource that depends on them.
+
+## Step 04
+
 Delete the Limits and validate that all resources are gone.