Merge pull request #123 from stefangusa/custom-annotations

Added custom annotations to sensorcontainer and actionrunner Pods

Author: armab

CHANGELOG.md

@@ -1,6 +1,7 @@
 # Changelog
 
 ## In Development
+* Added custom annotations to sensorcontainer and actionrunner Pods (#123) (by @stefangusa)
 
 
 ## v0.25.0

templates/deployments.yaml

@@ -831,6 +831,9 @@ spec:
       annotations:
         checksum/config: {{ include (print $.Template.BasePath "/configmaps_st2-conf.yaml") $ | sha256sum }}
         checksum/packs: {{ include (print $.Template.BasePath "/configmaps_packs.yaml") $ | sha256sum }}
+        {{- if .annotations }}
+{{ toYaml .annotations | indent 8 }}
+        {{- end }}
     spec:
       imagePullSecrets:
       {{- if $.Values.enterprise.enabled }}
@@ -976,6 +979,9 @@ spec:
       annotations:
         checksum/config: {{ include (print $.Template.BasePath "/configmaps_st2-conf.yaml") . | sha256sum }}
         checksum/ssh: {{ include (print $.Template.BasePath "/secrets_ssh.yaml") . | sha256sum }}
+        {{- if .Values.st2actionrunner.annotations }}
+{{ toYaml .Values.st2actionrunner.annotations | indent 8 }}
+        {{- end }}
     spec:
       {{- if .Values.st2actionrunner.hostAliases }}
       hostAliases:

values.yaml

@@ -108,6 +108,7 @@ st2:
       - name:
         livenessProbe: {}
         readinessProbe: {}
+        annotations: {}
         # TODO: Find out recommended/default resources for this specific service (#5)
         resources: {}
         # Additional advanced settings to control pod/deployment placement
@@ -340,6 +341,7 @@ st2actionrunner:
   replicas: 5
   # TODO: Find out recommended/default resources for this specific service (#5)
   resources: {}
+  annotations: {}
   # Additional advanced settings to control pod/deployment placement
   nodeSelector: {}
   tolerations: []