feat(argus,csc): support for custom serviceaccount

Author: sagar-mamdapure

charts/argus/Chart.yaml

@@ -6,7 +6,7 @@ maintainers:
   - email: argus@logicmonitor.com
     name: LogicMonitor
 name: argus
-version: 14.1.0-rt01
+version: 14.1.1-rc01
 home: https://logicmonitor.github.io/helm-charts-qa
 appVersion: v17.3.1-rt01
 dependencies:

charts/argus/templates/serviceaccount.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.serviceAccount.create -}}
+{{- if eq (include "lmutil.shouldCreateServiceAccount" .) "true" -}}
   {{- if ne (include "lmutil.serviceAccountName" .) "default" -}}
 apiVersion: v1
 kind: ServiceAccount

charts/collectorset-controller/Chart.yaml

@@ -6,7 +6,7 @@ maintainers:
   - email: argus@logicmonitor.com
     name: LogicMonitor
 name: collectorset-controller
-version: 12.2.0-rt01
+version: 12.2.1-rc01
 home: https://logicmonitor.github.io/helm-charts-qa
 appVersion: v13.3.0-rt01
 dependencies:

charts/collectorset-controller/templates/serviceaccount.yaml

@@ -1,4 +1,5 @@
-{{- if and .Values.serviceAccount.create (ne (include "lmutil.serviceAccountName" .) "default") -}}
+{{- $globalSAConfigured := and .Values.global .Values.global.serviceAccount .Values.global.serviceAccount.name -}}
+{{- if and (eq (include "lmutil.shouldCreateServiceAccount" .) "true") (ne (include "lmutil.serviceAccountName" .) "default") -}}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
@@ -11,11 +12,9 @@ metadata:
 imagePullSecrets:
   {{- include "lmutil.imagePullSecrets" . | nindent 2 }}
 {{- end }}
-
+{{- if and .Values.serviceAccount.collector.create (ne (include "lmutil.serviceAccountName" .) "default") (not $globalSAConfigured) }}
 ---
-
-# ServiceAccount for collector, only if both serviceAccount.collector.name and global.serviceAccount.name are not set
-{{ if and .Values.serviceAccount.collector.create (ne (include "lmutil.serviceAccountName" .) "default") -}}
+# ServiceAccount for collector
 apiVersion: v1
 kind: ServiceAccount
 metadata: