Merge branch 'master' into inject-datastore-encryption-key

Author: valentintorikian

CHANGELOG.md

@@ -1,10 +1,14 @@
 # Changelog
 
 ## In Development
-* Change ingress name from `<release name>-ingress` to <release name>-st2web-ingress, useful when using `stackstorm-ha` as a requirement for another chart. (#112) (by @erenatas)
+* Allow injection of datastore key in cluster (#115) (by @AngryDeveloper)
+
+## v0.25.0
+* Change ingress name from `<release name>-ingress` to `<release name>-st2web-ingress`, useful when using `stackstorm-ha` as a requirement for another chart. (#112) (by @erenatas)
 * Fix st2web ingress which should have been defined as an Integer instead of a String (#111) (by @erenatas)
 * Add an option to inject hostAliases in the st2actionrunner containers (#114)
-* Allow injection of datastore key in cluster (#115) (by @AngryDeveloper)
+* Add support for Service Accounts (#117) (by @Vince-Chenal)
+
 
 ## v0.24.0
 * Fix st2web ingress to use `/` path by default instead of `/*`, useful for nginx ingress controller (#103) (by @erenatas)

Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 # Update StackStorm version here to rely on other Docker images tags
 appVersion: 3.2dev
 name: stackstorm-ha
-version: 0.24.0
+version: 0.25.0
 description: StackStorm K8s Helm Chart, optimized for running StackStorm in HA environment.
 home: https://stackstorm.com/#product
 icon: https://avatars1.githubusercontent.com/u/4969009

templates/_helpers.tpl

@@ -1,3 +1,8 @@
+# Expand the name of the chart.
+{{- define "stackstorm-ha.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
 # Image pull secret used to access private docker.stackstorm.com Docker registry with Enterprise images
 {{- define "imagePullSecret" }}
 {{- if required "Missing context '.Values.enterprise.enabled'!" .Values.enterprise.enabled -}}
@@ -23,6 +28,13 @@ stackstorm
 {{- end -}}
 {{- end -}}
 
+{{/*
+Create the name of the stackstorm-ha service account to use
+*/}}
+{{- define "stackstorm-ha.serviceAccountName" -}}
+{{- default .Chart.Name .Values.serviceAccount.serviceAccountName -}}
+{{- end -}}
+
 # Generate '-enterprise' suffix only when it's needed for resource names, docker images, etc
 {{- define "enterpriseSuffix" -}}
 {{ if required "Missing context '.Values.enterprise.enabled'!" .Values.enterprise.enabled }}-enterprise{{ end }}

templates/deployments.yaml

@@ -86,6 +86,9 @@ spec:
           readOnly: true
         resources:
 {{ toYaml .Values.st2auth.resources | indent 10 }}
+    {{- if .Values.st2auth.serviceAccount.attach }}
+      serviceAccountName: {{ template "stackstorm-ha.serviceAccountName" . }}
+    {{- end }}
       volumes:
         - name: st2-config-vol
           configMap:
@@ -219,6 +222,9 @@ spec:
         {{- end }}
         resources:
 {{ toYaml .Values.st2api.resources | indent 10 }}
+    {{- if .Values.st2api.serviceAccount.attach }}
+      serviceAccountName: {{ template "stackstorm-ha.serviceAccountName" . }}
+    {{- end }}
       volumes:
         {{- if .Values.secrets.st2.datastore_crypto_key }}
         - name: st2-encryption-key-vol
@@ -310,6 +316,9 @@ spec:
           subPath: st2.user.conf
         resources:
 {{ toYaml .Values.st2stream.resources | indent 10 }}
+    {{- if .Values.st2stream.serviceAccount.attach }}
+      serviceAccountName: {{ template "stackstorm-ha.serviceAccountName" . }}
+    {{- end }}
       volumes:
         - name: st2-config-vol
           configMap:
@@ -393,6 +402,9 @@ spec:
         volumeMounts: []
         resources:
 {{ toYaml .Values.st2web.resources | indent 10 }}
+    {{- if .Values.st2web.serviceAccount.attach }}
+      serviceAccountName: {{ template "stackstorm-ha.serviceAccountName" . }}
+    {{- end }}
       volumes: []
     {{- with .Values.st2web.nodeSelector }}
       nodeSelector:
@@ -473,6 +485,9 @@ spec:
         {{- end }}
         resources:
 {{ toYaml .Values.st2rulesengine.resources | indent 10 }}
+    {{- if .Values.st2rulesengine.serviceAccount.attach }}
+      serviceAccountName: {{ template "stackstorm-ha.serviceAccountName" . }}
+    {{- end }}
       volumes:
         - name: st2-config-vol
           configMap:
@@ -557,6 +572,9 @@ spec:
           subPath: st2.user.conf
         resources:
 {{ toYaml .Values.st2timersengine.resources | indent 10 }}
+    {{- if .Values.st2timersengine.serviceAccount.attach }}
+      serviceAccountName: {{ template "stackstorm-ha.serviceAccountName" . }}
+    {{- end }}
       volumes:
         - name: st2-config-vol
           configMap:
@@ -640,6 +658,9 @@ spec:
         {{- end }}
         resources:
 {{ toYaml .Values.st2workflowengine.resources | indent 10 }}
+    {{- if .Values.st2workflowengine.serviceAccount.attach }}
+      serviceAccountName: {{ template "stackstorm-ha.serviceAccountName" . }}
+    {{- end }}
       volumes:
         - name: st2-config-vol
           configMap:
@@ -722,6 +743,9 @@ spec:
           subPath: st2.user.conf
         resources:
 {{ toYaml .Values.st2scheduler.resources | indent 10 }}
+    {{- if .Values.st2scheduler.serviceAccount.attach }}
+      serviceAccountName: {{ template "stackstorm-ha.serviceAccountName" . }}
+    {{- end }}
       volumes:
         - name: st2-config-vol
           configMap:
@@ -797,6 +821,9 @@ spec:
           subPath: st2.user.conf
         resources:
 {{ toYaml .Values.st2notifier.resources | indent 10 }}
+    {{- if .Values.st2notifier.serviceAccount.attach }}
+      serviceAccountName: {{ template "stackstorm-ha.serviceAccountName" . }}
+    {{- end }}
       volumes:
         - name: st2-config-vol
           configMap:
@@ -942,6 +969,9 @@ spec:
         {{- end }}
         resources:
 {{ toYaml .resources | indent 10 }}
+    {{- if .serviceAccount.attach }}
+      serviceAccountName: {{ template "stackstorm-ha.serviceAccountName" $ }}
+    {{- end }}
       volumes:
         {{- if $.Values.secrets.st2.datastore_crypto_key }}
         - name: st2-encryption-key-vol
@@ -1092,6 +1122,9 @@ spec:
         {{- end }}
         resources:
 {{ toYaml .Values.st2actionrunner.resources | indent 10 }}
+    {{- if .Values.st2actionrunner.serviceAccount.attach }}
+      serviceAccountName: {{ template "stackstorm-ha.serviceAccountName" . }}
+    {{- end }}
       volumes:
         {{- if .Values.secrets.st2.datastore_crypto_key }}
         - name: st2-encryption-key-vol
@@ -1189,6 +1222,9 @@ spec:
           subPath: st2.user.conf
         resources:
 {{ toYaml .Values.st2garbagecollector.resources | indent 10 }}
+    {{- if .Values.st2garbagecollector.serviceAccount.attach }}
+      serviceAccountName: {{ template "stackstorm-ha.serviceAccountName" . }}
+    {{- end }}
       volumes:
         - name: st2-config-vol
           configMap:
@@ -1485,6 +1521,9 @@ spec:
           periodSeconds: 30
         resources:
 {{ toYaml .Values.st2chatops.resources | indent 10 }}
+    {{- if .Values.st2chatops.serviceAccount.attach }}
+        serviceAccountName: {{ template "stackstorm-ha.serviceAccountName" . }}
+    {{- end }}
     {{- with .Values.st2chatops.nodeSelector }}
       nodeSelector:
 {{ toYaml . | indent 8 }}

templates/service-account.yaml

@@ -0,0 +1,16 @@
+{{- if .Values.serviceAccount.create }}
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ template "stackstorm-ha.serviceAccountName" . }}
+  {{- if .Values.serviceAccount.serviceAccountAnnotations }}
+  annotations:
+{{ toYaml .Values.serviceAccount.serviceAccountAnnotations | indent 4 }}
+  {{- end }}
+  labels:
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    app: "{{ template "stackstorm-ha.name" . }}"
+    heritage: "{{ .Release.Service }}"
+    release: "{{ .Release.Name }}"
+{{- end }}

values.yaml

@@ -53,6 +53,17 @@ enterprise:
       #  roles:
       #    - "admin"
 
+##
+## Service Account
+##
+serviceAccount:
+  # Whether the Chart should create the service account or not
+  create: true
+  # Used to define service account annotations
+  serviceAccountAnnotations: {}
+  # Used to override service account name
+  serviceAccountName:
+
 ##
 ## StackStorm shared variables
 ##
@@ -103,6 +114,8 @@ st2:
         affinity: {}
         nodeSelector: {}
         tolerations: []
+        serviceAccount:
+          attach: false
   # Import data into StackStorm's Key/Value datastore (https://docs.stackstorm.com/datastore.html)
   keyvalue:
     #- name: st2_version
@@ -227,6 +240,8 @@ st2web:
   nodeSelector: {}
   tolerations: []
   affinity: {}
+  serviceAccount:
+    attach: false
 # https://docs.stackstorm.com/reference/ha.html#st2auth
 # Multiple st2auth processes can be behind a load balancer in an active-active configuration.
 st2auth:
@@ -237,6 +252,8 @@ st2auth:
   nodeSelector: {}
   tolerations: []
   affinity: {}
+  serviceAccount:
+    attach: false
 # https://docs.stackstorm.com/reference/ha.html#st2api
 # Multiple st2api process can be behind a load balancer in an active-active configuration.
 st2api:
@@ -247,6 +264,8 @@ st2api:
   nodeSelector: {}
   tolerations: []
   affinity: {}
+  serviceAccount:
+    attach: false
 # https://docs.stackstorm.com/reference/ha.html#st2stream
 # Multiple st2stream process can be behind a load balancer in an active-active configuration.
 st2stream:
@@ -257,6 +276,8 @@ st2stream:
   nodeSelector: {}
   tolerations: []
   affinity: {}
+  serviceAccount:
+    attach: false
 # https://docs.stackstorm.com/reference/ha.html#st2rulesengine
 # Multiple st2rulesengine processes can run in active-active with only connections to MongoDB and RabbitMQ. All these will share the TriggerInstance load and naturally pick up more work if one or more of the processes becomes unavailable.
 st2rulesengine:
@@ -267,6 +288,8 @@ st2rulesengine:
   nodeSelector: {}
   tolerations: []
   affinity: {}
+  serviceAccount:
+    attach: false
 # https://docs.stackstorm.com/reference/ha.html#st2timersengine
 # Only single replica is created via K8s Deployment as timersengine can't work in active-active mode at the moment and it relies on K8s failover/reschedule capabilities to address cases of process failure.
 st2timersengine:
@@ -276,6 +299,8 @@ st2timersengine:
   nodeSelector: {}
   tolerations: []
   affinity: {}
+  serviceAccount:
+    attach: false
 # https://docs.stackstorm.com/reference/ha.html#st2workflowengine
 # Multiple st2workflowengine processes can run in active-active mode and will share the load and pick up more work if one or more of the processes become available.
 st2workflowengine:
@@ -286,6 +311,8 @@ st2workflowengine:
   nodeSelector: {}
   tolerations: []
   affinity: {}
+  serviceAccount:
+    attach: false
 # https://docs.stackstorm.com/reference/ha.html#st2scheduler
 # TODO: Description TBD
 st2scheduler:
@@ -296,6 +323,8 @@ st2scheduler:
   nodeSelector: {}
   tolerations: []
   affinity: {}
+  serviceAccount:
+    attach: false
 # https://docs.stackstorm.com/reference/ha.html#st2notifier
 # st2notifier runs in active-active mode and requires for that coordination backend like Redis or Zookeeper
 st2notifier:
@@ -306,6 +335,8 @@ st2notifier:
   nodeSelector: {}
   tolerations: []
   affinity: {}
+  serviceAccount:
+    attach: false
 # https://docs.stackstorm.com/reference/ha.html#st2actionrunner
 # Multiple st2actionrunner processes can run in active-active with only connections to MongoDB and RabbitMQ. Work gets naturally
 # distributed across runners via RabbitMQ. Adding more st2actionrunner processes increases the ability of StackStorm to execute actions.
@@ -326,6 +357,8 @@ st2actionrunner:
   #  - hostnames:
   #      - bar
   #   ip: 8.8.8.8
+  serviceAccount:
+    attach: false
 
 # https://docs.stackstorm.com/reference/ha.html#st2garbagecollector
 # Optional service that cleans up old executions and other operations data based on setup configurations.
@@ -339,6 +372,8 @@ st2garbagecollector:
   nodeSelector: {}
   tolerations: []
   affinity: {}
+  serviceAccount:
+    attach: false
 
 ##
 ## StackStorm ChatOps (https://docs.stackstorm.com/chatops/index.html)
@@ -371,6 +406,8 @@ st2chatops:
   nodeSelector: {}
   tolerations: []
   affinity: {}
+  serviceAccount:
+    attach: false
 
 ##
 ## MongoDB HA configuration (3rd party chart dependency)