Merge branch 'master' into refactor-secrets

Author: arm4b

CHANGELOG.md

@@ -10,6 +10,7 @@
 * If your k8s cluster admin requires custom annotations (eg: to indicate mongo or rabbitmq usage), you can now add those to each set of pods. (#195) (by @cognifloyd)
 * BREAKING CHANGE: Move secrets.st2.* values into st2.* (#203) (by @cognifloyd)
 * Auto-generate password and ssh_key secrets. (#203) (by @cognifloyd)
+* Add optional hubot-scripts volume to st2chatops pod. To add this, define `st2chatops.hubotScriptsVolume`. (#207) (by @cognifloyd)
 
 ## v0.60.0
 * Switch st2 version to `v3.5dev` as a new latest development version (#187)

templates/deployments.yaml

@@ -1448,6 +1448,14 @@ spec:
     {{- if .Values.st2chatops.serviceAccount.attach }}
         serviceAccountName: {{ template "stackstorm-ha.serviceAccountName" . }}
     {{- end }}
+    {{- if .Values.st2chatops.hubotScriptsVolume }}
+        volumeMounts:
+        - name: st2-chatops-hubot-scripts-vol
+          mountPath: /opt/stackstorm/chatops/scripts
+      volumes:
+        - name: st2-chatops-hubot-scripts-vol
+          {{- toYaml .Values.st2chatops.hubotScriptsVolume | nindent 10 }}
+    {{- end }}
     {{- with .Values.st2chatops.nodeSelector }}
       nodeSelector:
 {{ toYaml . | indent 8 }}

values.yaml

@@ -484,6 +484,11 @@ st2chatops:
       memory: "50Mi"
       cpu: "5m"
   annotations: {}
+  # Advanced use-cases only. If defined, this hubot-scripts volume gets mounted to: /opt/stackstorm/chatops/scripts
+  # This volume (using any k8s storage solution, including configmap) allows for hubot customization.
+  # Most installations should not use this.
+  # For details on writing .js or .coffeescript hubot extensions, see: https://hubot.github.com/docs/scripting/
+  hubotScriptsVolume: {}
   # Additional advanced settings to control pod/deployment placement
   nodeSelector: {}
   tolerations: []