allow custom annotations for all pods

Author: cognifloyd

templates/_helpers.tpl

@@ -105,6 +105,13 @@ Create the name of the stackstorm-ha service account to use
   {{- end }}
 {{- end -}}
 
+# Reusable annotations list
+{{- define "custom-annotations" -}}
+  {{- if .annotations }}
+{{ toYaml .annotations }}
+  {{- end }}
+{{- end -}}
+
 # For custom st2packs-Container reduce duplicity by defining it here once
 {{- define "packs-volumes" -}}
   {{- if .Values.st2.packs.images }}

templates/deployments.yaml

@@ -35,6 +35,7 @@ spec:
       annotations:
         checksum/config: {{ include (print $.Template.BasePath "/configmaps_st2-conf.yaml") . | sha256sum }}
         checksum/auth: {{ include (print $.Template.BasePath "/secrets_st2auth.yaml") . | sha256sum }}
+{{ include "custom-annotations" .Values.st2auth | indent 8 }}
     spec:
       imagePullSecrets:
       {{- if .Values.image.pullSecret }}
@@ -145,6 +146,7 @@ spec:
       annotations:
         checksum/config: {{ include (print $.Template.BasePath "/configmaps_st2-conf.yaml") . | sha256sum }}
         checksum/datastore-key: {{ include (print $.Template.BasePath "/secrets_datastore_crypto_key.yaml") . | sha256sum }}
+{{ include "custom-annotations" .Values.st2api | indent 8 }}
     spec:
       imagePullSecrets:
       {{- if .Values.image.pullSecret }}
@@ -255,6 +257,7 @@ spec:
         heritage: {{ .Release.Service }}
       annotations:
         checksum/config: {{ include (print $.Template.BasePath "/configmaps_st2-conf.yaml") . | sha256sum }}
+{{ include "custom-annotations" .Values.st2stream | indent 8 }}
     spec:
       imagePullSecrets:
       {{- if .Values.image.pullSecret }}
@@ -333,6 +336,7 @@ spec:
         heritage: {{ .Release.Service }}
       annotations:
         checksum/config: {{ include (print $.Template.BasePath "/configmaps_st2web.yaml") . | sha256sum }}
+{{ include "custom-annotations" .Values.st2web | indent 8 }}
     spec:
       imagePullSecrets:
       {{- if .Values.image.pullSecret }}
@@ -431,6 +435,7 @@ spec:
         heritage: {{ .Release.Service }}
       annotations:
         checksum/config: {{ include (print $.Template.BasePath "/configmaps_st2-conf.yaml") . | sha256sum }}
+{{ include "custom-annotations" .Values.st2rulesengine | indent 8 }}
     spec:
       imagePullSecrets:
       {{- if .Values.image.pullSecret }}
@@ -518,6 +523,7 @@ spec:
         heritage: {{ .Release.Service }}
       annotations:
         checksum/config: {{ include (print $.Template.BasePath "/configmaps_st2-conf.yaml") . | sha256sum }}
+{{ include "custom-annotations" .Values.st2timersengine | indent 8 }}
     spec:
       imagePullSecrets:
       {{- if .Values.image.pullSecret }}
@@ -597,6 +603,7 @@ spec:
       annotations:
         checksum/config: {{ include (print $.Template.BasePath "/configmaps_st2-conf.yaml") . | sha256sum }}
         checksum/datastore-key: {{ include (print $.Template.BasePath "/secrets_datastore_crypto_key.yaml") . | sha256sum }}
+{{ include "custom-annotations" .Values.st2workflowengine | indent 8 }}
     spec:
       imagePullSecrets:
       {{- if .Values.image.pullSecret }}
@@ -688,6 +695,7 @@ spec:
       annotations:
         checksum/config: {{ include (print $.Template.BasePath "/configmaps_st2-conf.yaml") . | sha256sum }}
         checksum/datastore-key: {{ include (print $.Template.BasePath "/secrets_datastore_crypto_key.yaml") . | sha256sum }}
+{{ include "custom-annotations" .Values.st2scheduler | indent 8 }}
     spec:
       imagePullSecrets:
       {{- if .Values.image.pullSecret }}
@@ -779,6 +787,7 @@ spec:
         heritage: {{ .Release.Service }}
       annotations:
         checksum/config: {{ include (print $.Template.BasePath "/configmaps_st2-conf.yaml") . | sha256sum }}
+{{ include "custom-annotations" .Values.st2notifier | indent 8 }}
     spec:
       imagePullSecrets:
       {{- if .Values.image.pullSecret }}
@@ -862,9 +871,7 @@ spec:
         checksum/config: {{ include (print $.Template.BasePath "/configmaps_st2-conf.yaml") $ | sha256sum }}
         checksum/packs: {{ include (print $.Template.BasePath "/configmaps_packs.yaml") $ | sha256sum }}
         checksum/datastore-key: {{ include (print $.Template.BasePath "/secrets_datastore_crypto_key.yaml") $ | sha256sum }}
-        {{- if .annotations }}
-{{ toYaml .annotations | indent 8 }}
-        {{- end }}
+{{ include "custom-annotations" . | indent 8 }}
     spec:
       imagePullSecrets:
       {{- if $.Values.image.pullSecret }}
@@ -992,9 +999,7 @@ spec:
         checksum/config: {{ include (print $.Template.BasePath "/configmaps_st2-conf.yaml") . | sha256sum }}
         checksum/ssh: {{ include (print $.Template.BasePath "/secrets_ssh.yaml") . | sha256sum }}
         checksum/datastore-key: {{ include (print $.Template.BasePath "/secrets_datastore_crypto_key.yaml") . | sha256sum }}
-        {{- if .Values.st2actionrunner.annotations }}
-{{ toYaml .Values.st2actionrunner.annotations | indent 8 }}
-        {{- end }}
+{{ include "custom-annotations" .Values.st2actionrunner | indent 8 }}
     spec:
       {{- if .Values.st2actionrunner.hostAliases }}
       hostAliases:
@@ -1118,6 +1123,7 @@ spec:
         heritage: {{ .Release.Service }}
       annotations:
         checksum/config: {{ include (print $.Template.BasePath "/configmaps_st2-conf.yaml") . | sha256sum }}
+{{ include "custom-annotations" .Values.st2garbagecollector | indent 8 }}
     spec:
       imagePullSecrets:
       {{- if .Values.image.pullSecret }}
@@ -1199,6 +1205,7 @@ spec:
         checksum/auth: {{ include (print $.Template.BasePath "/secrets_st2auth.yaml") . | sha256sum }}
         checksum/ssh: {{ include (print $.Template.BasePath "/secrets_ssh.yaml") . | sha256sum }}
         checksum/datastore-key: {{ include (print $.Template.BasePath "/secrets_datastore_crypto_key.yaml") . | sha256sum }}
+{{ include "custom-annotations" .Values.st2client | indent 8 }}
     spec:
       imagePullSecrets:
       {{- if .Values.st2.packs.images }}
@@ -1367,6 +1374,7 @@ spec:
         heritage: {{ .Release.Service }}
       annotations:
         checksum/chatops: {{ include (print $.Template.BasePath "/secrets_st2chatops.yaml") . | sha256sum }}
+{{ include "custom-annotations" .Values.st2chatops | indent 8 }}
     spec:
       {{- if .Values.image.pullSecret }}
       imagePullSecrets:

templates/jobs.yaml

@@ -58,6 +58,7 @@ spec:
           mountPath: /opt/stackstorm/rbac/assignments/
         - name: st2-rbac-mappings-vol
           mountPath: /opt/stackstorm/rbac/mappings/
+{{ include "custom-annotations" .Values.jobs | indent 8 }}
         # TODO: Find out default resource limits for this specific service (#5)
         #resources:
       volumes:
@@ -172,6 +173,7 @@ spec:
         - name: st2-apikeys-vol
           mountPath: /etc/st2/apikeys.yaml
           subPath: apikeys.yaml
+{{ include "custom-annotations" .Values.jobs | indent 8 }}
         # TODO: Find out default resource limits for this specific service (#5)
         #resources:
       volumes:
@@ -276,6 +278,7 @@ spec:
         - name: st2-kv-vol
           mountPath: /etc/st2/st2kv.yaml
           subPath: st2kv.yaml
+{{ include "custom-annotations" .Values.jobs | indent 8 }}
         # TODO: Find out default resource limits for this specific service (#5)
         #resources:
       volumes:
@@ -360,6 +363,7 @@ spec:
         - name: st2-virtualenvs-vol
           mountPath: /opt/stackstorm/virtualenvs/
         {{- end }}
+{{ include "custom-annotations" .Values.jobs | indent 8 }}
         # TODO: Find out default resource limits for this specific service (#5)
         #resources:
       volumes:

values.yaml

@@ -242,6 +242,7 @@ st2web:
       cpu: "50m"
     limits:
       memory: "100Mi"
+  annotations: {}
   # Override default image settings (for now, only tag can be overridden)
   image: {}
     ## Note that Helm templating is supported in this block!
@@ -274,6 +275,7 @@ st2auth:
     requests:
       memory: "85Mi"
       cpu: "50m"
+  annotations: {}
   # Override default image settings (for now, only tag can be overridden)
   image: {}
     ## Note that Helm templating is supported in this block!
@@ -292,6 +294,7 @@ st2api:
     requests:
       memory: "150Mi"
       cpu: "25m"
+  annotations: {}
   # Override default image settings (for now, only tag can be overridden)
   image: {}
     ## Note that Helm templating is supported in this block!
@@ -310,6 +313,7 @@ st2stream:
     requests:
       memory: "100Mi"
       cpu: "50m"
+  annotations: {}
   # Override default image settings (for now, only tag can be overridden)
   image: {}
     ## Note that Helm templating is supported in this block!
@@ -328,6 +332,7 @@ st2rulesengine:
     requests:
       memory: "75Mi"
       cpu: "25m"
+  annotations: {}
   # Override default image settings (for now, only tag can be overridden)
   image: {}
     ## Note that Helm templating is supported in this block!
@@ -345,6 +350,7 @@ st2timersengine:
     requests:
       memory: "75Mi"
       cpu: "10m"
+  annotations: {}
   # Override default image settings (for now, only tag can be overridden)
   image: {}
     ## Note that Helm templating is supported in this block!
@@ -363,6 +369,7 @@ st2workflowengine:
     requests:
       memory: "200Mi"
       cpu: "100m"
+  annotations: {}
   # Override default image settings (for now, only tag can be overridden)
   image: {}
     ## Note that Helm templating is supported in this block!
@@ -381,6 +388,7 @@ st2scheduler:
     requests:
       memory: "75Mi"
       cpu: "50m"
+  annotations: {}
   # Override default image settings (for now, only tag can be overridden)
   image: {}
     ## Note that Helm templating is supported in this block!
@@ -399,6 +407,7 @@ st2notifier:
     requests:
       memory: "75Mi"
       cpu: "50m"
+  annotations: {}
   # Override default image settings (for now, only tag can be overridden)
   image: {}
     ## Note that Helm templating is supported in this block!
@@ -442,6 +451,7 @@ st2actionrunner:
 # The st2client deployment/pod simplifies ad-hoc administration.
 # st2client is a special purpose actionrunner pod, but you can customize it separately
 st2client:
+  annotations: {}
   # Override default image settings (for now, only tag can be overridden)
   image: {}
     ## Note that Helm templating is supported in this block!
@@ -457,6 +467,7 @@ st2garbagecollector:
     requests:
       memory: "80Mi"
       cpu: "10m"
+  annotations: {}
   # Override default image settings (for now, only tag can be overridden)
   image: {}
     ## Note that Helm templating is supported in this block!
@@ -498,6 +509,7 @@ st2chatops:
     requests:
       memory: "50Mi"
       cpu: "5m"
+  annotations: {}
   # Additional advanced settings to control pod/deployment placement
   nodeSelector: {}
   tolerations: []
@@ -509,6 +521,7 @@ st2chatops:
 ## Various batch jobs (apply-rbac-definitions, apikey-load, key-load, register-content)
 ##
 jobs:
+  annotations: {}
   # Override default image settings (for now, only tag can be overridden)
   image: {}
     ## Note that Helm templating is supported in this block!