Merge pull request #278 from kubescape/unusedcapabilities

do not evaluate commented-out capabilities
kubescape · Sep 7, 2023 · f99c8ee · f99c8ee
2 parents 63b1d50 + 4ec514e
commit f99c8ee
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 22 deletions.
diff --git a/charts/kubescape-operator/Chart.yaml b/charts/kubescape-operator/Chart.yaml
@@ -9,14 +9,14 @@ type: application
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
 
-version: 1.15.0
+version: 1.15.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
 
-appVersion: 1.15.0
+appVersion: 1.15.1
 
 maintainers:
 - name: Ben Hirschberg

diff --git a/charts/kubescape-operator/templates/_helpers.tpl b/charts/kubescape-operator/templates/_helpers.tpl
@@ -45,7 +45,7 @@ kubevuln:
 kubevulnScheduler:
   enabled: {{ and $configurations.submit (or (eq .Values.capabilities.relevancy "enable") (eq .Values.capabilities.vulnerabilityScan "enable")) }}
 nodeAgent:
-  enabled: {{ or (eq .Values.capabilities.relevancy "enable") (eq .Values.capabilities.networkGenerator "enable") (eq .Values.capabilities.seccomp "enable") (eq .Values.capabilities.runtimeObservability "enable") }}
+  enabled: {{ (eq .Values.capabilities.relevancy "enable") }}
 operator:
   enabled: true
 otelCollector:

diff --git a/charts/kubescape-operator/tests/__snapshot__/snapshot_test.yaml.snap b/charts/kubescape-operator/tests/__snapshot__/snapshot_test.yaml.snap
@@ -1,7 +1,7 @@
 matches the snapshot:
   1: |
     raw: |
-      Thank you for installing kubescape-operator version 1.15.0.
+      Thank you for installing kubescape-operator version 1.15.1.
 
       You can see and change the values of your's recurring configurations daily scan in the following link:
       https://cloud.armosec.io/settings/assets/clusters/scheduled-scans?cluster=kind-kind
@@ -78,7 +78,7 @@ matches the snapshot:
         app: gateway
         app.kubernetes.io/instance: RELEASE-NAME
         app.kubernetes.io/name: gateway
-        helm.sh/chart: kubescape-operator-1.15.0
+        helm.sh/chart: kubescape-operator-1.15.1
         tier: ks-control-plane
       name: gateway
       namespace: kubescape
@@ -101,7 +101,7 @@ matches the snapshot:
             app: gateway
             app.kubernetes.io/instance: RELEASE-NAME
             app.kubernetes.io/name: gateway
-            helm.sh/chart: kubescape-operator-1.15.0
+            helm.sh/chart: kubescape-operator-1.15.1
             helm.sh/revision: "0"
             tier: ks-control-plane
         spec:
@@ -190,7 +190,7 @@ matches the snapshot:
     metadata:
       labels:
         app: gateway
-        helm.sh/chart: kubescape-operator-1.15.0
+        helm.sh/chart: kubescape-operator-1.15.1
         tier: ks-control-plane
       name: gateway
       namespace: kubescape
@@ -268,7 +268,7 @@ matches the snapshot:
             app: grype-offline-db
             app.kubernetes.io/instance: RELEASE-NAME
             app.kubernetes.io/name: grype-offline-db
-            helm.sh/chart: kubescape-operator-1.15.0
+            helm.sh/chart: kubescape-operator-1.15.1
             helm.sh/revision: "0"
             tier: ks-control-plane
         spec:
@@ -445,7 +445,7 @@ matches the snapshot:
             app: kollector
             app.kubernetes.io/instance: RELEASE-NAME
             app.kubernetes.io/name: kollector
-            helm.sh/chart: kubescape-operator-1.15.0
+            helm.sh/chart: kubescape-operator-1.15.1
             helm.sh/revision: "0"
             tier: ks-control-plane
         spec:
@@ -595,7 +595,7 @@ matches the snapshot:
                 - configMap:
                     name: kubescape-scheduler
                   name: kubescape-scheduler
-      schedule: 27 18 * * *
+      schedule: 4 8 * * *
   17: |
     apiVersion: rbac.authorization.k8s.io/v1
     kind: ClusterRole
@@ -808,7 +808,7 @@ matches the snapshot:
         app: kubescape
         app.kubernetes.io/instance: RELEASE-NAME
         app.kubernetes.io/name: kubescape
-        helm.sh/chart: kubescape-operator-1.15.0
+        helm.sh/chart: kubescape-operator-1.15.1
         tier: ks-control-plane
       name: kubescape
       namespace: kubescape
@@ -831,7 +831,7 @@ matches the snapshot:
             app: kubescape
             app.kubernetes.io/instance: RELEASE-NAME
             app.kubernetes.io/name: kubescape
-            helm.sh/chart: kubescape-operator-1.15.0
+            helm.sh/chart: kubescape-operator-1.15.1
             helm.sh/revision: "0"
             otel: enabled
             tier: ks-control-plane
@@ -1038,7 +1038,7 @@ matches the snapshot:
     metadata:
       labels:
         app: kubescape
-        helm.sh/chart: kubescape-operator-1.15.0
+        helm.sh/chart: kubescape-operator-1.15.1
         tier: ks-control-plane
       name: kubescape
       namespace: kubescape
@@ -1130,7 +1130,7 @@ matches the snapshot:
     metadata:
       labels:
         app: kubescape
-        helm.sh/chart: kubescape-operator-1.15.0
+        helm.sh/chart: kubescape-operator-1.15.1
       name: kubescape-monitor
       namespace: kubescape
     spec:
@@ -1211,7 +1211,7 @@ matches the snapshot:
                 - configMap:
                     name: kubevuln-scheduler
                   name: kubevuln-scheduler
-      schedule: 38 11 * * *
+      schedule: 16 3 * * *
   30: |
     apiVersion: rbac.authorization.k8s.io/v1
     kind: ClusterRole
@@ -1280,7 +1280,7 @@ matches the snapshot:
             app: kubevuln
             app.kubernetes.io/instance: RELEASE-NAME
             app.kubernetes.io/name: kubevuln
-            helm.sh/chart: kubescape-operator-1.15.0
+            helm.sh/chart: kubescape-operator-1.15.1
             helm.sh/revision: "0"
             otel: enabled
             tier: ks-control-plane
@@ -1541,7 +1541,7 @@ matches the snapshot:
             app: node-agent
             app.kubernetes.io/instance: RELEASE-NAME
             app.kubernetes.io/name: node-agent
-            helm.sh/chart: kubescape-operator-1.15.0
+            helm.sh/chart: kubescape-operator-1.15.1
             helm.sh/revision: "0"
             otel: enabled
             tier: ks-control-plane
@@ -1781,7 +1781,7 @@ matches the snapshot:
             app: operator
             app.kubernetes.io/instance: RELEASE-NAME
             app.kubernetes.io/name: operator
-            helm.sh/chart: kubescape-operator-1.15.0
+            helm.sh/chart: kubescape-operator-1.15.1
             helm.sh/revision: "0"
             otel: enabled
             tier: ks-control-plane
@@ -2048,7 +2048,7 @@ matches the snapshot:
         app: otel-collector
         app.kubernetes.io/instance: RELEASE-NAME
         app.kubernetes.io/name: otel-collector
-        helm.sh/chart: kubescape-operator-1.15.0
+        helm.sh/chart: kubescape-operator-1.15.1
         tier: ks-control-plane
       name: otel-collector
       namespace: kubescape
@@ -2071,7 +2071,7 @@ matches the snapshot:
             app: otel-collector
             app.kubernetes.io/instance: RELEASE-NAME
             app.kubernetes.io/name: otel-collector
-            helm.sh/chart: kubescape-operator-1.15.0
+            helm.sh/chart: kubescape-operator-1.15.1
             helm.sh/revision: "0"
             tier: ks-control-plane
         spec:
@@ -2127,7 +2127,7 @@ matches the snapshot:
     metadata:
       labels:
         app: otel-collector
-        helm.sh/chart: kubescape-operator-1.15.0
+        helm.sh/chart: kubescape-operator-1.15.1
         tier: ks-control-plane
       name: otel-collector
       namespace: kubescape
@@ -2203,7 +2203,7 @@ matches the snapshot:
             app.kubernetes.io/instance: RELEASE-NAME
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: service-discovery
-            helm.sh/chart: kubescape-operator-1.15.0
+            helm.sh/chart: kubescape-operator-1.15.1
             helm.sh/revision: "0"
             otel: enabled
             tier: ks-control-plane