fix test

Signed-off-by: Daniel Grunberger <[email protected]>
kubescape · Nov 20, 2023 · 21e72e4 · 21e72e4
1 parent 74506ca
commit 21e72e4
Show file tree

Hide file tree

Showing 10 changed files with 2,721 additions and 10 deletions.
diff --git a/charts/kubescape-operator/templates/gateway/deployment.yaml b/charts/kubescape-operator/templates/gateway/deployment.yaml
@@ -31,7 +31,7 @@ spec:
         checksum/cloud-secret: {{ include (printf "%s/%s/%s" $.Template.BasePath $.Values.global.configMapsDirectory $.Values.global.cloudSecretFile) . | sha256sum }}
         checksum/cloud-config: {{ include (printf "%s/%s/%s" $.Template.BasePath $.Values.global.configMapsDirectory $.Values.global.cloudConfigMapFile) . | sha256sum }}
       {{- if ne .Values.global.proxySecretFile "" }}
-        checksum/proxy-config: {{ include (printf "%s/%s/%s" $.Template.BasePath $.Values.global.proxySecretDirectory $.Values.global.proxySecretName) . | sha256sum }}
+        checksum/proxy-config: {{ include (printf "%s/%s/%s" $.Template.BasePath $.Values.global.proxySecretDirectory $.Values.global.proxySecretFile) . | sha256sum }}
       {{- end }}
       labels:
         app.kubernetes.io/name: {{ .Values.gateway.name }}

diff --git a/charts/kubescape-operator/templates/kollector/statefulset.yaml b/charts/kubescape-operator/templates/kollector/statefulset.yaml
@@ -27,7 +27,7 @@ spec:
         checksum/cloud-secret: {{ include (printf "%s/%s/%s" $.Template.BasePath $.Values.global.configMapsDirectory $.Values.global.cloudSecretFile) . | sha256sum }}
         checksum/cloud-config: {{ include (printf "%s/%s/%s" $.Template.BasePath $.Values.global.configMapsDirectory $.Values.global.cloudConfigMapFile) . | sha256sum }}
       {{- if ne .Values.global.proxySecretFile "" }}
-        checksum/proxy-config: {{ include (printf "%s/%s/%s" $.Template.BasePath $.Values.global.proxySecretDirectory $.Values.global.proxySecretName) . | sha256sum }}
+        checksum/proxy-config: {{ include (printf "%s/%s/%s" $.Template.BasePath $.Values.global.proxySecretDirectory $.Values.global.proxySecretFile) . | sha256sum }}
       {{- end }}
       labels:
         app.kubernetes.io/name: {{ .Values.kollector.name }}

diff --git a/charts/kubescape-operator/templates/kubescape/deployment.yaml b/charts/kubescape-operator/templates/kubescape/deployment.yaml
@@ -39,7 +39,7 @@ spec:
         checksum/cloud-secret: {{ include (printf "%s/%s/%s" $.Template.BasePath $.Values.global.configMapsDirectory $.Values.global.cloudSecretFile) . | sha256sum }}
         checksum/cloud-config: {{ include (printf "%s/%s/%s" $.Template.BasePath $.Values.global.configMapsDirectory $.Values.global.cloudConfigMapFile) . | sha256sum }}
       {{- if ne .Values.global.proxySecretFile "" }}
-        checksum/proxy-config: {{ include (printf "%s/%s/%s" $.Template.BasePath $.Values.global.proxySecretDirectory $.Values.global.proxySecretName) . | sha256sum }}
+        checksum/proxy-config: {{ include (printf "%s/%s/%s" $.Template.BasePath $.Values.global.proxySecretDirectory $.Values.global.proxySecretFile) . | sha256sum }}
       {{- end }}
       labels:
         app.kubernetes.io/name: {{ .Values.kubescape.name }}

diff --git a/charts/kubescape-operator/templates/kubevuln/deployment.yaml b/charts/kubescape-operator/templates/kubevuln/deployment.yaml
@@ -27,7 +27,7 @@ spec:
         checksum/cloud-secret: {{ include (printf "%s/%s/%s" $.Template.BasePath $.Values.global.configMapsDirectory $.Values.global.cloudSecretFile) . | sha256sum }}
         checksum/cloud-config: {{ include (printf "%s/%s/%s" $.Template.BasePath $.Values.global.configMapsDirectory $.Values.global.cloudConfigMapFile) . | sha256sum }}
       {{- if ne .Values.global.proxySecretFile "" }}
-        checksum/proxy-config: {{ include (printf "%s/%s/%s" $.Template.BasePath $.Values.global.proxySecretDirectory $.Values.global.proxySecretName) . | sha256sum }}
+        checksum/proxy-config: {{ include (printf "%s/%s/%s" $.Template.BasePath $.Values.global.proxySecretDirectory $.Values.global.proxySecretFile) . | sha256sum }}
       {{- end }}
       labels:
         app.kubernetes.io/name: {{ .Values.kubevuln.name }}

diff --git a/charts/kubescape-operator/templates/node-agent/daemonset.yaml b/charts/kubescape-operator/templates/node-agent/daemonset.yaml
@@ -24,7 +24,7 @@ spec:
         checksum/cloud-secret: {{ include (printf "%s/%s/%s" $.Template.BasePath $.Values.global.configMapsDirectory $.Values.global.cloudSecretFile) . | sha256sum }}
         checksum/cloud-config: {{ include (printf "%s/%s/%s" $.Template.BasePath $.Values.global.configMapsDirectory $.Values.global.cloudConfigMapFile) . | sha256sum }}
       {{- if ne .Values.global.proxySecretFile "" }}
-        checksum/proxy-config: {{ include (printf "%s/%s/%s" $.Template.BasePath $.Values.global.proxySecretDirectory $.Values.global.proxySecretName) . | sha256sum }}
+        checksum/proxy-config: {{ include (printf "%s/%s/%s" $.Template.BasePath $.Values.global.proxySecretDirectory $.Values.global.proxySecretFile) . | sha256sum }}
       {{- end }}
         container.apparmor.security.beta.kubernetes.io/node-agent: unconfined
       labels:

diff --git a/charts/kubescape-operator/templates/operator/deployment.yaml b/charts/kubescape-operator/templates/operator/deployment.yaml
@@ -33,7 +33,7 @@ spec:
         checksum/capabilities-config: {{ include (printf "%s/%s/%s" $.Template.BasePath $.Values.global.configMapsDirectory $.Values.global.capabilitiesConfigMap) . | sha256sum }}
         checksum/matching-rules-config: {{ include (printf "%s/%s/%s" $.Template.BasePath $.Values.global.configMapsDirectory $.Values.global.matchingRulesConfigMap) . | sha256sum }}
       {{- if ne .Values.global.proxySecretFile "" }}
-        checksum/proxy-config: {{ include (printf "%s/%s/%s" $.Template.BasePath $.Values.global.proxySecretDirectory $.Values.global.proxySecretName) . | sha256sum }}
+        checksum/proxy-config: {{ include (printf "%s/%s/%s" $.Template.BasePath $.Values.global.proxySecretDirectory $.Values.global.proxySecretFile) . | sha256sum }}
       {{- end }}
       labels:
         app.kubernetes.io/name: {{ .Values.operator.name }}

diff --git a/charts/kubescape-operator/templates/otel-collector/deployment.yaml b/charts/kubescape-operator/templates/otel-collector/deployment.yaml
@@ -29,7 +29,7 @@ spec:
     metadata:
       annotations:
       {{- if ne .Values.global.proxySecretFile "" }}
-        checksum/proxy-config: {{ include (printf "%s/%s/%s" $.Template.BasePath $.Values.global.proxySecretDirectory $.Values.global.proxySecretName) . | sha256sum }}
+        checksum/proxy-config: {{ include (printf "%s/%s/%s" $.Template.BasePath $.Values.global.proxySecretDirectory $.Values.global.proxySecretFile) . | sha256sum }}
       {{- end }}
       labels:
         app.kubernetes.io/name: {{ .Values.otelCollector.name }}