load unified config in kubescape

Signed-off-by: Amir Malka <[email protected]>
kubescape · Oct 21, 2023 · f3baa2e · f3baa2e
1 parent e52a237
commit f3baa2e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 13 deletions.
diff --git a/charts/kubescape-operator/templates/configs/cloudapi-configmap.yaml b/charts/kubescape-operator/templates/configs/cloudapi-configmap.yaml
@@ -41,6 +41,7 @@ data:
       "maxImageSize": {{ .Values.kubevuln.config.maxImageSize }},
       "keepLocal": {{ not $components.serviceDiscovery.enabled }},
       "scanTimeout": "{{ .Values.kubevuln.config.scanTimeout }}",
+      "continuousPostureScan": {{ and (eq .Values.capabilities.continuousScan "enable") ($components.storage.enabled) }},
 {{- if .Values.grypeOfflineDB.enabled }}
       "listingURL": "http://{{ .Values.grypeOfflineDB.name }}:80/listing.json",
 {{- end }}

diff --git a/charts/kubescape-operator/templates/kubescape/deployment.yaml b/charts/kubescape-operator/templates/kubescape/deployment.yaml
@@ -81,8 +81,6 @@ spec:
         env:
         - name: GOMEMLIMIT
           value: "{{ .Values.kubescape.resources.requests.memory }}B"
-        - name: CLUSTER_NAME
-          value: "{{ regexReplaceAll "\\W+" .Values.clusterName "-" }}"
         - name: KS_LOGGER_LEVEL
           value: "{{ .Values.logger.level }}"
         - name: KS_LOGGER_NAME
@@ -147,8 +145,6 @@ spec:
           readOnly: true
         - name: kubescape-volume
           mountPath: /home/nonroot/.kubescape
-        - name: kubescape-config-volume
-          mountPath: /home/nonroot/.kubescape/config.json
           subPath: config.json
         - name: host-scanner-definition
           mountPath: /home/nonroot/.kubescape/host-scanner.yaml
@@ -157,11 +153,9 @@ spec:
           mountPath: /home/nonroot/results
         - name: failed
           mountPath: /home/nonroot/failed
-        {{- if $components.serviceDiscovery.enabled }}
         - name: {{ .Values.global.cloudConfig }}
           mountPath: /etc/config
           readOnly: true
-        {{- end }}
 {{- if .Values.volumeMounts }}
 {{ toYaml .Values.volumeMounts | indent 8 }}
 {{- end }}
@@ -182,17 +176,16 @@ spec:
         secret:
           secretName: {{ .Values.global.proxySecretName }}
       {{- end }}
-      - name: kubescape-config-volume
-        configMap:
-          name: {{ .Values.kubescape.name }}-config
-      {{- if $components.serviceDiscovery.enabled }}
       - name: {{ .Values.global.cloudConfig }}
         configMap:
           name: {{ .Values.global.cloudConfig }}
           items:
-            - key: "services"
-              path: "services.json"
-      {{- end }}
+          - key: "clusterData"
+            path: "clusterData.json"
+          {{- if $components.serviceDiscovery.enabled }}
+          - key: "services"
+            path: "services.json"
+          {{- end }}
       - name: host-scanner-definition
         configMap:
           name: host-scanner-definition