Merge pull request #243 from devtron-labs/serviceaccount-security

feat: added serviceaccount to image-scanner
devtron-labs · Sep 23, 2024 · 0b7fc34 · 0b7fc34
2 parents 07dbbd2 + 4ba1f47
commit 0b7fc34
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/charts/security/Chart.yaml b/charts/security/Chart.yaml
@@ -15,7 +15,7 @@ maintainers:
     email: [email protected]
 sources:
   - https://github.com/devtron-labs/charts
-version: 0.1.7
+version: 0.1.8
 appVersion: "0.1.1"
 dependencies:
 - name: clair

diff --git a/charts/security/templates/_helpers.tpl b/charts/security/templates/_helpers.tpl
@@ -33,10 +33,10 @@ Return full image
 {{/*
 Expand the node selectors, tolerations, and image pull secrets for a Kubernetes resource.
 Usage:
-{{ include "common.nodeSelector" (dict "nodeSelector" .Values.path.to.nodeSelector "tolerations" .Values.path.to.tolerations "imagePullSecrets" .Values.path.to.imagePullSecrets "global" .Values.global ) }}
+{{ include "common.schedulerConfig" (dict "nodeSelector" .Values.path.to.nodeSelector "tolerations" .Values.path.to.tolerations "imagePullSecrets" .Values.path.to.imagePullSecrets "global" .Values.global ) }}
 */}}
 
-{{- define "common.nodeSelector" -}}
+{{- define "common.schedulerConfig" -}}
   {{- if .nodeSelector }}
 nodeSelector:
 {{ toYaml .nodeSelector | indent 2 }}

diff --git a/charts/security/templates/image-scanner.yaml b/charts/security/templates/image-scanner.yaml
@@ -91,7 +91,8 @@ spec:
 {{ toYaml .labels | indent 8 }}    
 {{- end}} 
     spec:
-      {{- include "common.nodeSelector" (dict "nodeSelector" $.Values.imageScanner.nodeSelector "tolerations" $.Values.imageScanner.tolerations "imagePullSecrets" $.Values.imageScanner.imagePullSecrets "global" $.Values.global) | indent 6 }}
+      {{- include "common.schedulerConfig" (dict "nodeSelector" $.Values.imageScanner.nodeSelector "tolerations" $.Values.imageScanner.tolerations "imagePullSecrets" $.Values.imageScanner.imagePullSecrets "global" $.Values.global) | indent 6 }}
+      serviceAccountName: devtron-default-sa
       terminationGracePeriodSeconds: 30
       restartPolicy: Always
       {{- if and $.Values.global $.Values.global.podSecurityContext }}