feat(chart): Modify sevice accounts (#1179)

Signed-off-by: Javier Rodriguez <[email protected]>

Author: javirln

deployment/chainloop/Chart.yaml

@@ -7,7 +7,7 @@ description: Chainloop is an open source software supply chain control plane, a
 
 type: application
 # Bump the patch (not minor, not major) version on each change in the Chart Source code
-version: 1.86.0
+version: 1.86.1
 # Do not update appVersion, this is handled automatically by the release process
 appVersion: v0.95.3
 

deployment/chainloop/templates/cas/serviceaccount.yaml

@@ -8,10 +8,11 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ include "chainloop.cas.serviceAccountName" . }}
-  labels:
-    {{- include "chainloop.cas.labels" . | nindent 4 }}
-  {{- with .Values.cas.serviceAccount.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
+  namespace: {{ include "common.names.namespace" . | quote }}
+  labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
+    app.kubernetes.io/component: cas
+  {{- if or .Values.cas.serviceAccount.annotations .Values.commonAnnotations }}
+  {{- $annotations := include "common.tplvalues.merge" (dict "values" (list .Values.cas.serviceAccount.annotations .Values.commonAnnotations) "context" .) }}
+  annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $ ) | nindent 4 }}
+  {{- end }}
   {{- end }}
-{{- end }}

deployment/chainloop/templates/controlplane/serviceaccount.yaml

@@ -8,10 +8,11 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ include "controlplane.serviceAccountName" . }}
-  labels:
-    {{- include "chainloop.controlplane.labels" . | nindent 4 }}
-  {{- with .Values.controlplane.serviceAccount.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
+  namespace: {{ include "common.names.namespace" . | quote }}
+  labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
+    app.kubernetes.io/component: controlplane
+  {{- if or .Values.controlplane.serviceAccount.annotations .Values.commonAnnotations }}
+  {{- $annotations := include "common.tplvalues.merge" (dict "values" (list .Values.controlplane.serviceAccount.annotations .Values.commonAnnotations) "context" .) }}
+  annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $ ) | nindent 4 }}
+  {{- end }}
   {{- end }}
-{{- end }}