Merge branch 'main' into remove_deletion_step

kyverno · Sep 13, 2023 · d41f344 · d41f344
2 parents f310597 + fa3731e
commit d41f344
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 11 deletions.
diff --git a/...req/refresh-volumes-in-pods/04-check.yaml → ...volumes-in-pods/04-check-annotations.yaml b/...req/refresh-volumes-in-pods/04-check.yaml → ...volumes-in-pods/04-check-annotations.yaml
@@ -13,14 +13,4 @@ commands:
     if [ "$annotation" = "1234abcd" ]; then exit 0; else exit 1; fi
 - script: |
     annotation=$(kubectl get pod pod04 -n refresh-vols-ns -o json | kyverno jp query "metadata.annotations.\"corp.org/random\" || '' " | tail -n 1 | cut -d '"' -f 2)
-    if [ "$annotation" = "1234abcd" ]; then exit 0; else exit 1; fi
-- script: |
-    val=$(kubectl exec pod01 -n refresh-vols-ns -- cat /mnt/foo/foo)
-    if [ "$val" = "bar" ]; then exit 0; else exit 1; fi
-- script: |
-    val=$(kubectl exec pod02 -n refresh-vols-ns -- cat /mnt/foo/foo)
-    if [ "$val" = "bar" ]; then exit 0; else exit 1; fi
-- script: |
-    val=$(kubectl exec pod04 -n refresh-vols-ns -- cat /mnt/foo/foo)
-    if [ "$val" = "bar" ]; then exit 0; else exit 1; fi
-- command: kubectl delete all --all --force --grace-period=0 -n refresh-vols-ns
+    if [ "$annotation" = "1234abcd" ]; then exit 0; else exit 1; fi
diff --git a/other/rec-req/refresh-volumes-in-pods/05-check.yaml b/other/rec-req/refresh-volumes-in-pods/05-check.yaml
@@ -0,0 +1,14 @@
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+commands:
+- command: sleep 3
+- script: |
+    val=$(kubectl exec pod01 -n refresh-vols-ns -- cat /mnt/foo/foo)
+    if [ "$val" = "bar" ]; then exit 0; else exit 1; fi
+- script: |
+    val=$(kubectl exec pod02 -n refresh-vols-ns -- cat /mnt/foo/foo)
+    if [ "$val" = "bar" ]; then exit 0; else exit 1; fi
+- script: |
+    val=$(kubectl exec pod04 -n refresh-vols-ns -- cat /mnt/foo/foo)
+    if [ "$val" = "bar" ]; then exit 0; else exit 1; fi
+- command: kubectl delete all --all --force --grace-period=0 -n refresh-vols-ns