fix pre-upgrade Job

Signed-off-by: Matthias Bertschy <[email protected]>
kubescape · Aug 29, 2024 · e871dcd · e871dcd
1 parent 9e15177
commit e871dcd
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/charts/kubescape-operator/templates/hooks/hook-delete-before-upgrade.yaml b/charts/kubescape-operator/templates/hooks/hook-delete-before-upgrade.yaml
@@ -17,6 +17,7 @@ rules:
     resources:
       - daemonsets
       - deployments
+      - statefulsets
     verbs:
       - "delete"
 ---
@@ -82,9 +83,9 @@ spec:
               kubectl -n {{ .Values.ksNamespace }} delete deployment kubescape --ignore-not-found=true;
               kubectl -n {{ .Values.ksNamespace }} delete deployment kubevuln --ignore-not-found=true;
               kubectl -n {{ .Values.ksNamespace }} delete deployment operator --ignore-not-found=true;
-              kubectl -n {{ .Values.ksNamespace }} delete deployment oter-collector --ignore-not-found=true;
+              kubectl -n {{ .Values.ksNamespace }} delete deployment otel-collector --ignore-not-found=true;
               kubectl -n {{ .Values.ksNamespace }} delete deployment storage --ignore-not-found=true;
               kubectl -n {{ .Values.ksNamespace }} delete deployment synchronizer --ignore-not-found=true;
-              kubectl -n {{ .Values.ksNamespace }} delete deployment kollector --ignore-not-found=true;
+              kubectl -n {{ .Values.ksNamespace }} delete statefulset kollector --ignore-not-found=true;
       restartPolicy: Never
   backoffLimit: 6
diff --git a/charts/kubescape-operator/tests/__snapshot__/snapshot_test.yaml.snap b/charts/kubescape-operator/tests/__snapshot__/snapshot_test.yaml.snap
@@ -758,6 +758,7 @@ all capabilities:
         resources:
           - daemonsets
           - deployments
+          - statefulsets
         verbs:
           - delete
   21: |
@@ -814,7 +815,7 @@ all capabilities:
                 - -e
                 - -x
                 - -c
-                - kubectl -n kubescape delete daemonset node-agent --ignore-not-found=true; kubectl -n kubescape delete deployment gateway --ignore-not-found=true; kubectl -n kubescape delete deployment kubescape --ignore-not-found=true; kubectl -n kubescape delete deployment kubevuln --ignore-not-found=true; kubectl -n kubescape delete deployment operator --ignore-not-found=true; kubectl -n kubescape delete deployment oter-collector --ignore-not-found=true; kubectl -n kubescape delete deployment storage --ignore-not-found=true; kubectl -n kubescape delete deployment synchronizer --ignore-not-found=true; kubectl -n kubescape delete deployment kollector --ignore-not-found=true;
+                - kubectl -n kubescape delete daemonset node-agent --ignore-not-found=true; kubectl -n kubescape delete deployment gateway --ignore-not-found=true; kubectl -n kubescape delete deployment kubescape --ignore-not-found=true; kubectl -n kubescape delete deployment kubevuln --ignore-not-found=true; kubectl -n kubescape delete deployment operator --ignore-not-found=true; kubectl -n kubescape delete deployment otel-collector --ignore-not-found=true; kubectl -n kubescape delete deployment storage --ignore-not-found=true; kubectl -n kubescape delete deployment synchronizer --ignore-not-found=true; kubectl -n kubescape delete statefulset kollector --ignore-not-found=true;
               image: docker.io/bitnami/kubectl:1.30.3
               imagePullPolicy: IfNotPresent
               name: label-selector-force-replace
@@ -6379,6 +6380,7 @@ default capabilities:
         resources:
           - daemonsets
           - deployments
+          - statefulsets
         verbs:
           - delete
   14: |
@@ -6435,7 +6437,7 @@ default capabilities:
                 - -e
                 - -x
                 - -c
-                - kubectl -n kubescape delete daemonset node-agent --ignore-not-found=true; kubectl -n kubescape delete deployment gateway --ignore-not-found=true; kubectl -n kubescape delete deployment kubescape --ignore-not-found=true; kubectl -n kubescape delete deployment kubevuln --ignore-not-found=true; kubectl -n kubescape delete deployment operator --ignore-not-found=true; kubectl -n kubescape delete deployment oter-collector --ignore-not-found=true; kubectl -n kubescape delete deployment storage --ignore-not-found=true; kubectl -n kubescape delete deployment synchronizer --ignore-not-found=true; kubectl -n kubescape delete deployment kollector --ignore-not-found=true;
+                - kubectl -n kubescape delete daemonset node-agent --ignore-not-found=true; kubectl -n kubescape delete deployment gateway --ignore-not-found=true; kubectl -n kubescape delete deployment kubescape --ignore-not-found=true; kubectl -n kubescape delete deployment kubevuln --ignore-not-found=true; kubectl -n kubescape delete deployment operator --ignore-not-found=true; kubectl -n kubescape delete deployment otel-collector --ignore-not-found=true; kubectl -n kubescape delete deployment storage --ignore-not-found=true; kubectl -n kubescape delete deployment synchronizer --ignore-not-found=true; kubectl -n kubescape delete statefulset kollector --ignore-not-found=true;
               image: docker.io/bitnami/kubectl:1.30.3
               imagePullPolicy: IfNotPresent
               name: label-selector-force-replace
@@ -11051,6 +11053,7 @@ disable otel:
         resources:
           - daemonsets
           - deployments
+          - statefulsets
         verbs:
           - delete
   10: |
@@ -11107,7 +11110,7 @@ disable otel:
                 - -e
                 - -x
                 - -c
-                - kubectl -n kubescape delete daemonset node-agent --ignore-not-found=true; kubectl -n kubescape delete deployment gateway --ignore-not-found=true; kubectl -n kubescape delete deployment kubescape --ignore-not-found=true; kubectl -n kubescape delete deployment kubevuln --ignore-not-found=true; kubectl -n kubescape delete deployment operator --ignore-not-found=true; kubectl -n kubescape delete deployment oter-collector --ignore-not-found=true; kubectl -n kubescape delete deployment storage --ignore-not-found=true; kubectl -n kubescape delete deployment synchronizer --ignore-not-found=true; kubectl -n kubescape delete deployment kollector --ignore-not-found=true;
+                - kubectl -n kubescape delete daemonset node-agent --ignore-not-found=true; kubectl -n kubescape delete deployment gateway --ignore-not-found=true; kubectl -n kubescape delete deployment kubescape --ignore-not-found=true; kubectl -n kubescape delete deployment kubevuln --ignore-not-found=true; kubectl -n kubescape delete deployment operator --ignore-not-found=true; kubectl -n kubescape delete deployment otel-collector --ignore-not-found=true; kubectl -n kubescape delete deployment storage --ignore-not-found=true; kubectl -n kubescape delete deployment synchronizer --ignore-not-found=true; kubectl -n kubescape delete statefulset kollector --ignore-not-found=true;
               image: docker.io/bitnami/kubectl:1.30.3
               imagePullPolicy: IfNotPresent
               name: label-selector-force-replace
@@ -14869,6 +14872,7 @@ minimal capabilities:
         resources:
           - daemonsets
           - deployments
+          - statefulsets
         verbs:
           - delete
   7: |
@@ -14925,7 +14929,7 @@ minimal capabilities:
                 - -e
                 - -x
                 - -c
-                - kubectl -n kubescape delete daemonset node-agent --ignore-not-found=true; kubectl -n kubescape delete deployment gateway --ignore-not-found=true; kubectl -n kubescape delete deployment kubescape --ignore-not-found=true; kubectl -n kubescape delete deployment kubevuln --ignore-not-found=true; kubectl -n kubescape delete deployment operator --ignore-not-found=true; kubectl -n kubescape delete deployment oter-collector --ignore-not-found=true; kubectl -n kubescape delete deployment storage --ignore-not-found=true; kubectl -n kubescape delete deployment synchronizer --ignore-not-found=true; kubectl -n kubescape delete deployment kollector --ignore-not-found=true;
+                - kubectl -n kubescape delete daemonset node-agent --ignore-not-found=true; kubectl -n kubescape delete deployment gateway --ignore-not-found=true; kubectl -n kubescape delete deployment kubescape --ignore-not-found=true; kubectl -n kubescape delete deployment kubevuln --ignore-not-found=true; kubectl -n kubescape delete deployment operator --ignore-not-found=true; kubectl -n kubescape delete deployment otel-collector --ignore-not-found=true; kubectl -n kubescape delete deployment storage --ignore-not-found=true; kubectl -n kubescape delete deployment synchronizer --ignore-not-found=true; kubectl -n kubescape delete statefulset kollector --ignore-not-found=true;
               image: docker.io/bitnami/kubectl:1.30.3
               imagePullPolicy: IfNotPresent
               name: label-selector-force-replace