Merge branch 'patch-1' of https://github.com/larssb/helm-charts-1 int…

…o patch-1

latest from head

charts/dependency_chart/operatorcommand-crds/Chart.yaml

@@ -4,6 +4,6 @@ description: A Helm chart CRDs for Kubescape Operator commands
 
 type: application
 
-version: 0.0.1
+version: 0.0.2
 
-appVersion: "0.0.1"
+appVersion: "0.0.2"

charts/dependency_chart/operatorcommand-crds/crds/operator-command.crd.yaml

@@ -83,5 +83,9 @@ spec:
                     errorCode:
                       type: integer
                       nullable: true
+                payload:
+                  type: string
+                  format: byte
+                  nullable: true
       subresources:
         status: {}

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.22.6
+version: 1.22.7
 
 # 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.22.6
+appVersion: 1.22.7
 
 maintainers:
 - name: Ben Hirschberg
@@ -51,5 +51,5 @@ dependencies:
     repository: "file://../dependency_chart/servicescanresult-crds"
     condition: serviceScanConfig.enabled
   - name: kubescape-operator-command-crd
-    version: 0.0.1
+    version: 0.0.2
     repository: "file://../dependency_chart/operatorcommand-crds"

charts/kubescape-operator/templates/_common.tpl

@@ -59,7 +59,15 @@ kubevuln:
 kubevulnScheduler:
   enabled: {{ and $configurations.submit (eq .Values.capabilities.vulnerabilityScan "enable") }}
 nodeAgent:
-  enabled: {{ or (eq .Values.capabilities.relevancy "enable") (eq .Values.capabilities.runtimeObservability "enable") (eq .Values.capabilities.networkPolicyService "enable") }}
+  enabled: {{ or
+   (eq .Values.capabilities.relevancy "enable")
+   (eq .Values.capabilities.runtimeObservability "enable")
+   (eq .Values.capabilities.networkPolicyService "enable")
+   (eq .Values.capabilities.runtimeDetection "enable")
+   (eq .Values.capabilities.malwareDetection "enable")
+   (eq .Values.capabilities.nodeProfileService "enable")
+   (eq .Values.capabilities.seccompProfileService "enable")
+  }}
 operator:
   enabled: true
 otelCollector:
@@ -74,7 +82,7 @@ cloudSecret:
   create: {{ $configurations.createCloudSecret }}
   name: {{ if $configurations.createCloudSecret }}"cloud-secret"{{ else }}{{ .Values.credentials.cloudSecret }}{{ end }}
 synchronizer:
-  enabled: {{ or (and $configurations.submit (eq .Values.capabilities.networkPolicyService "enable")) (and $configurations.submit (eq .Values.capabilities.runtimeObservability "enable")) }}
+  enabled: {{ $configurations.submit }}
 clamAV:
   enabled: {{ eq .Values.capabilities.malwareDetection "enable" }}
 customCaCertificates:

charts/kubescape-operator/templates/node-agent/service.yaml

@@ -14,5 +14,5 @@ spec:
     targetPort: 8080
     protocol: TCP
   selector:
-    app.kubernetes.io/name: {{ .Values.nodeAgent.name }}
+    {{- include "kubescape-operator.selectorLabels" (dict "Chart" .Chart "Release" .Release "Values" .Values "app" .Values.nodeAgent.name) | nindent 4 }}
 {{- end }}

charts/kubescape-operator/templates/operator/clusterrole.yaml

@@ -25,4 +25,10 @@ rules:
   - apiGroups: ["kubescape.io"]
     resources: ["servicesscanresults"]
     verbs: ["get", "watch", "list", "create", "update", "delete" ,"patch"]
+  - apiGroups: ["kubescape.io"]
+    resources: ["operatorcommands"]
+    verbs: ["get", "watch", "list"]
+  - apiGroups: ["kubescape.io"]
+    resources: ["operatorcommands/status"]
+    verbs: ["get", "watch", "list", "update", "patch"]
   {{- end }}