chore: upgrade chainsaw and remove a couple of kubectl/envsubst calls (…

…keptn#3021) Signed-off-by: Charles-Edouard Brétéché <[email protected]> Signed-off-by: vickysomtee <[email protected]>
Vickysomtee · Apr 22, 2024 · 7d8e34c · 7d8e34c
1 parent 9fa19a0
commit 7d8e34c
Show file tree

Hide file tree

Showing 42 changed files with 212 additions and 156 deletions.
diff --git a/.chainsaw-local.yaml b/.chainsaw-local.yaml
@@ -4,6 +4,7 @@ kind: Configuration
 metadata:
   name: configuration-local
 spec:
+  template: true
   timeouts:
     assert: 5m
     cleanup: 5m

diff --git a/.chainsaw.yaml b/.chainsaw.yaml
@@ -5,6 +5,7 @@ metadata:
   name: configuration
 spec:
   skipDelete: true
+  template: true
   timeouts:
     assert: 6m40s
     cleanup: 6m40s

diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml
@@ -39,7 +39,7 @@ jobs:
         uses: ./.github/actions/deploy-prometheus-on-cluster
 
       - name: Install Chainsaw
-        uses: kyverno/action-install-chainsaw@07b6c986572f2abaf6647c85d37cbecfddc4a6ab # v0.1.3
+        uses: kyverno/action-install-chainsaw@8307cf9038333ce168dd4339ae24f9ab16ab7a00 # v0.1.4
 
       - name: Run Scheduling Gates Integration Tests
         if: inputs.scheduling-gates == 'gates_on' && inputs.allowed-namespaces == 'allowed_ns_off'

diff --git a/test/chainsaw/integration/app-creation-request/chainsaw-test.yaml b/test/chainsaw/integration/app-creation-request/chainsaw-test.yaml
@@ -4,11 +4,13 @@ kind: Test
 metadata:
   name: app-creation-request
 spec:
+  namespaceTemplate:
+    metadata:
+      annotations:
+        keptn.sh/lifecycle-toolkit: enabled
   steps:
     - name: step-00
       try:
-        - script:
-            content: kubectl annotate ns $NAMESPACE keptn.sh/lifecycle-toolkit='enabled'
         - apply:
             file: 00-install.yaml
         - assert:

diff --git a/test/chainsaw/integration/app-failing-post-evaluation/chainsaw-test.yaml b/test/chainsaw/integration/app-failing-post-evaluation/chainsaw-test.yaml
@@ -4,11 +4,13 @@ kind: Test
 metadata:
   name: app-failing-post-evaluation
 spec:
+  namespaceTemplate:
+    metadata:
+      annotations:
+        keptn.sh/lifecycle-toolkit: enabled
   steps:
     - name: step-00
       try:
-        - script:
-            content: kubectl annotate ns $NAMESPACE keptn.sh/lifecycle-toolkit='enabled'
         - apply:
             file: 00-install.yaml
         - assert:

diff --git a/test/chainsaw/integration/app-failing-post-task/chainsaw-test.yaml b/test/chainsaw/integration/app-failing-post-task/chainsaw-test.yaml
@@ -4,11 +4,13 @@ kind: Test
 metadata:
   name: app-failing-post-task
 spec:
+  namespaceTemplate:
+    metadata:
+      annotations:
+        keptn.sh/lifecycle-toolkit: enabled
   steps:
     - name: step-00
       try:
-        - script:
-            content: kubectl annotate ns $NAMESPACE keptn.sh/lifecycle-toolkit='enabled'
         - apply:
             file: 00-install.yaml
         - assert:

diff --git a/test/chainsaw/integration/app-failing-pre-evaluation/chainsaw-test.yaml b/test/chainsaw/integration/app-failing-pre-evaluation/chainsaw-test.yaml
@@ -4,11 +4,13 @@ kind: Test
 metadata:
   name: app-failing-pre-evaluation
 spec:
+  namespaceTemplate:
+    metadata:
+      annotations:
+        keptn.sh/lifecycle-toolkit: enabled
   steps:
     - name: step-00
       try:
-        - script:
-            content: kubectl annotate ns $NAMESPACE keptn.sh/lifecycle-toolkit='enabled'
         - apply:
             file: 00-install.yaml
         - assert:

diff --git a/test/chainsaw/integration/app-failing-pre-task-retry/chainsaw-test.yaml b/test/chainsaw/integration/app-failing-pre-task-retry/chainsaw-test.yaml
@@ -4,11 +4,13 @@ kind: Test
 metadata:
   name: app-failing-pre-task-retry
 spec:
+  namespaceTemplate:
+    metadata:
+      annotations:
+        keptn.sh/lifecycle-toolkit: enabled
   steps:
     - name: step-00
       try:
-        - script:
-            content: kubectl annotate ns $NAMESPACE keptn.sh/lifecycle-toolkit='enabled'
         - apply:
             file: 00-install.yaml
         - assert:

diff --git a/test/chainsaw/integration/app-failing-pre-task-timeout/chainsaw-test.yaml b/test/chainsaw/integration/app-failing-pre-task-timeout/chainsaw-test.yaml
@@ -4,11 +4,13 @@ kind: Test
 metadata:
   name: app-failing-pre-task-timeout
 spec:
+  namespaceTemplate:
+    metadata:
+      annotations:
+        keptn.sh/lifecycle-toolkit: enabled
   steps:
     - name: step-00
       try:
-        - script:
-            content: kubectl annotate ns $NAMESPACE keptn.sh/lifecycle-toolkit='enabled'
         - apply:
             file: 00-install.yaml
         - assert:

diff --git a/test/chainsaw/integration/app-failing-pre-task/chainsaw-test.yaml b/test/chainsaw/integration/app-failing-pre-task/chainsaw-test.yaml
@@ -4,11 +4,13 @@ kind: Test
 metadata:
   name: app-failing-pre-task
 spec:
+  namespaceTemplate:
+    metadata:
+      annotations:
+        keptn.sh/lifecycle-toolkit: enabled
   steps:
     - name: step-00
       try:
-        - script:
-            content: kubectl annotate ns $NAMESPACE keptn.sh/lifecycle-toolkit='enabled'
         - apply:
             file: 00-install.yaml
         - assert:

diff --git a/test/chainsaw/integration/app-one-taskdefinition-not-found/chainsaw-test.yaml b/test/chainsaw/integration/app-one-taskdefinition-not-found/chainsaw-test.yaml
@@ -4,11 +4,13 @@ kind: Test
 metadata:
   name: app-one-taskdefinition-not-found
 spec:
+  namespaceTemplate:
+    metadata:
+      annotations:
+        keptn.sh/lifecycle-toolkit: enabled
   steps:
     - name: step-00
       try:
-        - script:
-            content: kubectl annotate ns $NAMESPACE keptn.sh/lifecycle-toolkit='enabled'
         - apply:
             file: 00-install.yaml
         - assert:

diff --git a/test/chainsaw/integration/container-runtime/chainsaw-test.yaml b/test/chainsaw/integration/container-runtime/chainsaw-test.yaml
@@ -4,11 +4,13 @@ kind: Test
 metadata:
   name: container-runtime
 spec:
+  namespaceTemplate:
+    metadata:
+      annotations:
+        keptn.sh/lifecycle-toolkit: enabled
   steps:
     - name: step-00
       try:
-        - script:
-            content: kubectl annotate ns $NAMESPACE keptn.sh/lifecycle-toolkit='enabled'
         - apply:
             file: 00-install.yaml
         - assert:

diff --git a/test/chainsaw/integration/imagepullsecret/chainsaw-test.yaml b/test/chainsaw/integration/imagepullsecret/chainsaw-test.yaml
@@ -4,11 +4,13 @@ kind: Test
 metadata:
   name: imagepullsecret
 spec:
+  namespaceTemplate:
+    metadata:
+      annotations:
+        keptn.sh/lifecycle-toolkit: enabled
   steps:
     - name: step-00
       try:
-        - script:
-            content: kubectl annotate ns $NAMESPACE keptn.sh/lifecycle-toolkit='enabled'
         - apply:
             file: 00-install.yaml
         - assert:

diff --git a/test/chainsaw/integration/podtato-head-application-auto-app-discovery/chainsaw-test.yaml b/test/chainsaw/integration/podtato-head-application-auto-app-discovery/chainsaw-test.yaml
@@ -4,11 +4,13 @@ kind: Test
 metadata:
   name: podtato-head-application-auto-app-discovery
 spec:
+  namespaceTemplate:
+    metadata:
+      annotations:
+        keptn.sh/lifecycle-toolkit: enabled
   steps:
     - name: step-00
       try:
-        - script:
-            content: kubectl annotate ns $NAMESPACE keptn.sh/lifecycle-toolkit='enabled'
         - apply:
             file: 00-install.yaml
         - assert:

diff --git a/test/chainsaw/integration/podtato-head-application/chainsaw-test.yaml b/test/chainsaw/integration/podtato-head-application/chainsaw-test.yaml
@@ -5,11 +5,13 @@ metadata:
   creationTimestamp: null
   name: podtato-head-application
 spec:
+  namespaceTemplate:
+    metadata:
+      annotations:
+        keptn.sh/lifecycle-toolkit: enabled
   steps:
     - name: step-00
       try:
-        - script:
-            content: kubectl annotate ns $NAMESPACE keptn.sh/lifecycle-toolkit='enabled'
         - apply:
             file: 00-install.yaml
         - assert:

diff --git a/test/chainsaw/integration/restartable-app/chainsaw-test.yaml b/test/chainsaw/integration/restartable-app/chainsaw-test.yaml
@@ -4,11 +4,13 @@ kind: Test
 metadata:
   name: restartable-app
 spec:
+  namespaceTemplate:
+    metadata:
+      annotations:
+        keptn.sh/lifecycle-toolkit: enabled
   steps:
     - name: step-00
       try:
-        - script:
-            content: kubectl annotate ns $NAMESPACE keptn.sh/lifecycle-toolkit='enabled'
         - apply:
             file: 00-install.yaml
         - assert:

diff --git a/test/chainsaw/integration/simple-daemonset-annotated/chainsaw-test.yaml b/test/chainsaw/integration/simple-daemonset-annotated/chainsaw-test.yaml
@@ -4,20 +4,20 @@ kind: Test
 metadata:
   name: simple-daemonset-annotated
 spec:
+  namespaceTemplate:
+    metadata:
+      annotations:
+        keptn.sh/lifecycle-toolkit: enabled
   steps:
     - name: step-00
       try:
-        - script:
-            content: kubectl annotate ns $NAMESPACE keptn.sh/lifecycle-toolkit='enabled'
         - apply:
             file: 00-install.yaml
         - assert:
             file: 01-assert.yaml
       catch:
         - podLogs:
             selector: app=daemonset
-        - script:
-            content: kubectl logs -l app=daemonset -n $NAMESPACE
     - name: step-01
       try:
         - apply:

diff --git a/test/chainsaw/integration/simple-deployment-annotated-with-app-context/chainsaw-test.yaml b/test/chainsaw/integration/simple-deployment-annotated-with-app-context/chainsaw-test.yaml
@@ -4,11 +4,13 @@ kind: Test
 metadata:
   name: simple-deployment-annotated-with-app-context
 spec:
+  namespaceTemplate:
+    metadata:
+      annotations:
+        keptn.sh/lifecycle-toolkit: enabled
   steps:
     - name: step-00
       try:
-        - script:
-            content: kubectl annotate ns $NAMESPACE keptn.sh/lifecycle-toolkit='enabled'
         - apply:
             file: 00-install.yaml
         - assert:

diff --git a/test/chainsaw/integration/simple-deployment-container-annotation/chainsaw-test.yaml b/test/chainsaw/integration/simple-deployment-container-annotation/chainsaw-test.yaml
@@ -4,11 +4,13 @@ kind: Test
 metadata:
   name: simple-deployment-container-annotation
 spec:
+  namespaceTemplate:
+    metadata:
+      annotations:
+        keptn.sh/lifecycle-toolkit: enabled
   steps:
     - name: step-00
       try:
-        - script:
-            content: kubectl annotate ns $NAMESPACE keptn.sh/lifecycle-toolkit='enabled'
         - apply:
             file: 00-install.yaml
         - assert:

diff --git a/test/chainsaw/integration/simple-deployment-evaluation/chainsaw-test.yaml b/test/chainsaw/integration/simple-deployment-evaluation/chainsaw-test.yaml
@@ -4,11 +4,13 @@ kind: Test
 metadata:
   name: simple-deployment-evaluation
 spec:
+  namespaceTemplate:
+    metadata:
+      annotations:
+        keptn.sh/lifecycle-toolkit: enabled
   steps:
     - name: step-00
       try:
-        - script:
-            content: kubectl annotate ns $NAMESPACE keptn.sh/lifecycle-toolkit='enabled'
         - apply:
             file: 00-install.yaml
         - assert:

diff --git a/test/chainsaw/integration/simple-deployment-k8s-recommended-label/chainsaw-test.yaml b/test/chainsaw/integration/simple-deployment-k8s-recommended-label/chainsaw-test.yaml
@@ -4,11 +4,13 @@ kind: Test
 metadata:
   name: simple-deployment-k8s-recommended-label
 spec:
+  namespaceTemplate:
+    metadata:
+      annotations:
+        keptn.sh/lifecycle-toolkit: enabled
   steps:
     - name: step-00
       try:
-        - script:
-            content: kubectl annotate ns $NAMESPACE keptn.sh/lifecycle-toolkit='enabled'
         - apply:
             file: 00-install.yaml
         - assert:

diff --git a/test/chainsaw/integration/simple-deployment-python-runtime/chainsaw-test.yaml b/test/chainsaw/integration/simple-deployment-python-runtime/chainsaw-test.yaml
@@ -4,11 +4,13 @@ kind: Test
 metadata:
   name: simple-deployment-python-runtime
 spec:
+  namespaceTemplate:
+    metadata:
+      annotations:
+        keptn.sh/lifecycle-toolkit: enabled
   steps:
     - name: step-00
       try:
-        - script:
-            content: kubectl annotate ns $NAMESPACE keptn.sh/lifecycle-toolkit='enabled'
         - apply:
             file: 00-install.yaml
         - assert:

diff --git a/test/chainsaw/integration/simple-deployment-recursive-task/chainsaw-test.yaml b/test/chainsaw/integration/simple-deployment-recursive-task/chainsaw-test.yaml
@@ -4,11 +4,13 @@ kind: Test
 metadata:
   name: simple-deployment-recursive-task
 spec:
+  namespaceTemplate:
+    metadata:
+      annotations:
+        keptn.sh/lifecycle-toolkit: enabled
   steps:
     - name: step-00
       try:
-        - script:
-            content: kubectl annotate ns $NAMESPACE keptn.sh/lifecycle-toolkit='enabled'
         - apply:
             file: 00-install.yaml
         - assert:

diff --git a/test/chainsaw/integration/simple-deployment-sanitize-version-number/chainsaw-test.yaml b/test/chainsaw/integration/simple-deployment-sanitize-version-number/chainsaw-test.yaml
@@ -4,11 +4,13 @@ kind: Test
 metadata:
   name: simple-deployment-sanitize-version-number
 spec:
+  namespaceTemplate:
+    metadata:
+      annotations:
+        keptn.sh/lifecycle-toolkit: enabled
   steps:
     - name: step-00
       try:
-        - script:
-            content: kubectl annotate ns $NAMESPACE keptn.sh/lifecycle-toolkit='enabled'
         - apply:
             file: 00-install.yaml
         - assert:

diff --git a/test/chainsaw/integration/simple-deployment/chainsaw-test.yaml b/test/chainsaw/integration/simple-deployment/chainsaw-test.yaml
@@ -4,11 +4,13 @@ kind: Test
 metadata:
   name: simple-deployment
 spec:
+  namespaceTemplate:
+    metadata:
+      annotations:
+        keptn.sh/lifecycle-toolkit: enabled
   steps:
     - name: step-00
       try:
-        - script:
-            content: kubectl annotate ns $NAMESPACE keptn.sh/lifecycle-toolkit='enabled'
         - apply:
             file: 00-install.yaml
         - assert: