Merge pull request #242 from devtron-labs/serviceaccount-clair

misc: added service-account to clair and correct the selectors of clair service

Author: prakarsh-dt

charts/clair/Chart.yaml

@@ -12,4 +12,4 @@ maintainers:
 name: clair
 sources:
 - https://github.com/coreos/clair
-version: 0.1.12
+version: 0.1.13

charts/clair/templates/_helpers.tpl

@@ -56,10 +56,10 @@ If release name contains chart name it will be used as a full name.
 {{/*
 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 }}

charts/clair/templates/deployment.yaml

@@ -24,7 +24,8 @@ spec:
         integration: security
 {{ toYaml .Values.labels | indent 8 }}
     spec:
-      {{- include "common.nodeSelector" (dict "nodeSelector" $.Values.nodeSelector "tolerations" $.Values.tolerations "imagePullSecrets" $.Values.imagePullSecrets "global" $.Values.global) | indent 6 }}
+      {{- include "common.schedulerConfig" (dict "nodeSelector" $.Values.nodeSelector "tolerations" $.Values.tolerations "imagePullSecrets" $.Values.imagePullSecrets "global" $.Values.global) | indent 6 }}
+      serviceAccountName: devtron-default-sa
       volumes:
       - name: "{{ .Chart.Name }}-config"
         secret:

charts/clair/templates/service.yaml

@@ -6,7 +6,7 @@ metadata:
     heritage: {{ .Release.Service | quote }}
     release: {{ .Release.Name | quote }}
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
-    app: clair
+    app: {{ template "clair.fullname" . }}
     integration: security
 {{ toYaml .Values.labels | indent 4 }}
 spec:
@@ -30,6 +30,6 @@ spec:
     heritage: {{ .Release.Service | quote }}
     release: {{ .Release.Name | quote }}
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
-    app: clair
+    app: {{ template "clair.fullname" . }}
     integration: security
 {{ toYaml .Values.labels | indent 4 }}