Merge pull request #542 from kubescape/bump

allow forcing virtual CRDs and submit
kubescape · Nov 22, 2024 · d658df9 · d658df9
2 parents 0a30aae + 8c9315f
commit d658df9
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/charts/kubescape-operator/templates/_common.tpl b/charts/kubescape-operator/templates/_common.tpl
@@ -22,12 +22,14 @@ synchronizerConfig: {{ include (printf "%s/synchronizer/configmap.yaml" $.Templa
 {{- $ksOtel := empty .Values.otelCollector.disable -}}
 {{- $otel := not (empty .Values.configurations.otelUrl) -}}
 {{- $submit := not (empty .Values.server) -}}
+{{- $virtualCrds := not (empty .Values.storage.forceVirtualCrds) -}}
 continuousScan: {{ and (eq .Values.capabilities.continuousScan "enable") (not $submit) }}
 createCloudSecret: {{ $createCloudSecret }}
 ksOtel: {{ and $ksOtel $submit }}
 otel: {{ $otel }}
 otelPort : {{ if $otel }}{{ splitList ":" .Values.configurations.otelUrl | last }}{{ else }}""{{ end }}
 runtimeObservability: {{ eq .Values.capabilities.runtimeObservability "enable" }}
+virtualCrds: {{ or $virtualCrds (not $submit) }}
 submit: {{ $submit }}
   {{- if $submit -}}
     {{- if and (empty .Values.account) $createCloudSecret -}}

diff --git a/charts/kubescape-operator/templates/storage/deployment.yaml b/charts/kubescape-operator/templates/storage/deployment.yaml
@@ -73,7 +73,7 @@ spec:
           - name: OTEL_COLLECTOR_SVC
             value: "otel-collector:4317"
           {{- end }}
-          {{- if $configurations.submit }}
+          {{- if not $configurations.virtualCrds }}
           - name: DISABLE_VIRTUAL_CRDS
             value: "true"
           {{- end }}

diff --git a/charts/kubescape-operator/tests/__snapshot__/snapshot_test.yaml.snap b/charts/kubescape-operator/tests/__snapshot__/snapshot_test.yaml.snap
@@ -5084,8 +5084,6 @@ all capabilities:
                       name: cloud-secret
                 - name: OTEL_COLLECTOR_SVC
                   value: otel-collector:4317
-                - name: DISABLE_VIRTUAL_CRDS
-                  value: "true"
               image: quay.io/kubescape/storage:v0.0.139
               imagePullPolicy: IfNotPresent
               livenessProbe:

diff --git a/charts/kubescape-operator/tests/snapshot_test.yaml b/charts/kubescape-operator/tests/snapshot_test.yaml
@@ -56,6 +56,7 @@ tests:
       kubescapeScheduler.scanSchedule: "1 2 3 4 5"
       kubevulnScheduler.scanSchedule: "1 2 3 4 5"
       nodeAgent.config.skipKernelVersionCheck: true
+      storage.forceVirtualCrds: true
   - it: minimal capabilities
     asserts:
       - matchSnapshot: {}
@@ -174,4 +175,4 @@ tests:
             - registry: test.example.com
               username: xxx
               password: yyy
-              insecure: true
+              insecure: true