Merge branch 'master' into fix_redis_password_issue

Author: cognifloyd

CHANGELOG.md

@@ -7,6 +7,7 @@
 * Fix mounts for `jobs.preRegisterContentCommand` container to use the same mounts as the primary register-content container. (#322) (by @cognifloyd)
 * Add support for providing custom st2actionrunner-specific docker repository, image name, pull policy, and pull secret via `values.yaml`. (#141) (by @Sheshagiri)
 * Fix bug that hung an init container when `st2.packs.volumes.enabled` without `st2.packs.volumes.configs`. (#324) (by @rebrowning)
+* Add ability to create custom labels for service account.(#327)(by @SuganJoe)
 * Fix bug that would not set the appropriate redis connection string when using `redis.password` and `redis.usePassword` (#325) (by @rebrowning)
 
 ## v0.100.0

templates/service-account.yaml

@@ -9,6 +9,9 @@ metadata:
     {{- toYaml .Values.serviceAccount.serviceAccountAnnotations | nindent 4 }}
   {{- end }}
   labels: {{- include "stackstorm-ha.labels" (list $ (include "stackstorm-ha.name" $)) | nindent 4 }}
+    {{- if .Values.serviceAccount.serviceAccountLabels }}
+    {{- toYaml .Values.serviceAccount.serviceAccountLabels | nindent 4 }}
+    {{- end }}
   {{- if .Values.serviceAccount.pullSecret }}
 imagePullSecrets:
 - name: "{{ .Values.serviceAccount.pullSecret }}"

tests/unit/labels_test.yaml

@@ -214,6 +214,24 @@ tests:
           path: metadata.labels.heritage
           value: Helm
 
+  - it: ServiceAccount accepts custom labels
+    template: service-account.yaml
+    set:
+      serviceAccount:
+        create: true
+        serviceAccountLabels:
+          foo: bar
+          answer: "42"
+    asserts:
+      - isNotNull:
+          path: metadata.labels
+      - equal:
+          path: metadata.labels.foo
+          value: bar
+      - equal:
+          path: metadata.labels.answer
+          value: "42"
+
   - it: st2web Ingress has required labels
     template: ingress.yaml
     set:

values.yaml

@@ -32,6 +32,9 @@ serviceAccount:
   serviceAccountAnnotations: {}
   # Used to override service account name
   serviceAccountName:
+  # Used to define any custom labels required
+  #serviceAccountLabels: {}
+
   # Fallback image pull secret.
   # If a pod does not have pull secrets, k8s will use the service account's pull secrets.
   # See: https://kubernetes.io/docs/reference/access-authn-authz/service-accounts-admin/#serviceaccount-admission-controller