Merge branch 'master' into empty-default-rbac-files

Author: cognifloyd

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## In Development
 * Explicitly differentiate sensor modes: `all-sensors-in-one-pod` vs `one-sensor-per-pod`. Exposes the mode in new `stackstorm/sensor-mode` annotation. (#222) (by @cognifloyd)
 * Allow adding custom env variables to any Deployment or Job. (#120) (by @AngryDeveloper)
+* Template the contents of st2.config and the values in st2chatops.env. This allows adding secrets defined elsewhere in values. (#249) (by @cognifloyd)
 * Set default/sample RBAC config files to "" (empty string) to prevent adding them. This is needed because they cannot be removed by overriding the roles/mappings values. (#247) (by @cognifloyd)
 
 ## v0.70.0
@@ -27,7 +28,7 @@
 * Fix a bug when datastore cryto keys are not able to read by the rules engine. ``datastore_crypto_key`` volume is now mounted on the ``st2rulesengine`` pods (#223) (by @moti1992)
 * Minimize required sensor config by using default values from st2sensorcontainer for each sensor in st2.packs.sensors (#221) (by @cognifloyd)
 * Do not template rabbitmq secrets file unless rabbitmq subchart is enabled. (#242) (by @cognifloyd)
-* Automatically st2chatop.env values if needed. (#241) (by @cognifloyd)
+* Automatically stringify st2chatop.env values if needed. (#241) (by @cognifloyd)
 
 ## v0.60.0
 * Switch st2 version to `v3.5dev` as a new latest development version (#187)

templates/configmaps_st2-conf.yaml

@@ -55,4 +55,4 @@ data:
   # User-defined st2 config with custom settings applied on top of everything else.
   # The order of merging: st2.conf < st2.docker.conf < st2.user.conf
   st2.user.conf: |
-{{ .Values.st2.config | indent 4 }}
+    {{- tpl .Values.st2.config . | nindent 4 }}

templates/secrets_st2chatops.yaml

@@ -16,6 +16,6 @@ metadata:
 type: Opaque
 data:
 {{- range $env, $value := .Values.st2chatops.env }}
-  {{ $env }}: {{ $value | toString | b64enc | quote }}
+  {{ $env }}: {{ tpl ($value | toString) $ | b64enc | quote }}
 {{- end }}
 {{- end }}

values.yaml

@@ -61,6 +61,7 @@ st2:
   #  -----END RSA PRIVATE KEY-----
 
   # Custom StackStorm config (st2.user.conf) which will apply settings on top of default st2.conf
+  # Note that Helm templating is supported in this block!
   config: |
     [api]
     allow_origin = '*'
@@ -642,6 +643,7 @@ st2chatops:
   # Custom hubot adapter ENV variables to pass through which will override st2chatops.env defaults.
   # See https://github.com/StackStorm/st2chatops/blob/master/st2chatops.env
   # for the full list of supported adapters and example ENV variables.
+  # Note that Helm templating is supported for env values in this block!
   env:
     HUBOT_ADAPTER: slack
     HUBOT_SLACK_TOKEN: xoxb-CHANGE-ME-PLEASE