CS Falcon Image Analyzer ( IAR ) Helm initial Draft

CrowdStrike · Jan 17, 2024 · 859544e · 859544e
1 parent 803115c
commit 859544e
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 14 deletions.
diff --git a/helm-charts/falcon-image-analyzer/templates/_helpers.tpl b/helm-charts/falcon-image-analyzer/templates/_helpers.tpl
@@ -73,10 +73,6 @@ runAsGroup: {{ .Values.securityContext.runAsGroup | default 0 }}
 {{- define "falcon-image-analyzer.volumeMounts" -}}
 {{- if lt (len .Values.volumeMounts) 2 -}}
 {{- .Values.volumeMounts | toYaml }}
-{{- if .Values.azure.enabled }}
-- name: azure-config
-  mountPath: /etc/kubernetes/azure.json
-{{- end }}
 {{- if eq .Values.crowdstrikeConfig.agentRunmode "socket" }}
 - name: var-run
   mountPath: {{ trimPrefix "unix://" (include "falcon-image-analyzer.agentRuntimeSocket" . ) }}
@@ -99,12 +95,6 @@ runAsGroup: {{ .Values.securityContext.runAsGroup | default 0 }}
 {{- define "falcon-image-analyzer.volumes" -}}
 {{- if lt (len .Values.volumes) 2 -}}
 {{- .Values.volumes | toYaml }}
-{{- if .Values.azure.enabled }}
-- name: azure-config
-  hostPath:
-    path: {{ .Values.azure.azureConfig }}
-    type: File
-{{- end }}
 {{- if eq .Values.crowdstrikeConfig.agentRunmode "socket" }}
 - name: var-run
   hostPath:

diff --git a/helm-charts/falcon-image-analyzer/templates/daemonset.yaml b/helm-charts/falcon-image-analyzer/templates/daemonset.yaml
@@ -56,12 +56,22 @@ spec:
                 {{- end }}
           volumeMounts:
           {{- (include "falcon-image-analyzer.volumeMounts" .) | nindent 12 }}
+          {{- if .Values.azure.enabled }}
+            - name: azure-config
+              mountPath: /etc/kubernetes/azure.json
+          {{- end }}
       {{- with .Values.nodeSelector }}
       nodeSelector:
       {{- toYaml . | nindent 8 }}
       {{- end }}
       volumes:
         {{- include "falcon-image-analyzer.volumes" . | nindent 8 }}
+        {{- if .Values.azure.enabled }}
+        - name: azure-config
+          hostPath:
+            path: {{ .Values.azure.azureConfig }}
+            type: File
+        {{- end }}
       {{- with .Values.affinity }}
       affinity:
       {{- toYaml . | nindent 8 }}

diff --git a/helm-charts/falcon-image-analyzer/templates/deployment.yaml b/helm-charts/falcon-image-analyzer/templates/deployment.yaml
@@ -58,15 +58,23 @@ spec:
                 name: {{ include "falcon-image-analyzer.fullname" . }}
                 {{- end }}
           volumeMounts:
-           {{- toYaml .Values.volumeMounts | default "" | nindent 12 }}
+          {{- toYaml .Values.volumeMounts | default "" | nindent 12 }}
+          {{- if .Values.azure.enabled }}
+            - name: azure-config
+              mountPath: /etc/kubernetes/azure.json
+          {{- end }}
       {{- with .Values.nodeSelector }}
       nodeSelector:
       {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with .Values.volumes }}
       volumes:
-        {{- toYaml . | default "" | nindent 8 }}
-      {{- end}}
+        {{- toYaml .Values.volumes | default "" | nindent 8 }}
+        {{- if .Values.azure.enabled }}
+        - name: azure-config
+          hostPath:
+            path: {{ .Values.azure.azureConfig }}
+            type: File
+        {{- end }}
       {{- with .Values.affinity }}
       affinity:
       {{- toYaml . | nindent 8 }}