put api_key under .Values.st2chatops instead of .Values.secrets

Author: cognifloyd

templates/deployments.yaml

@@ -1377,7 +1377,7 @@ spec:
         image: '{{ .Values.st2chatops.image.repository | default "stackstorm" }}/{{ .Values.st2chatops.image.name | default "st2chatops" }}:{{ tpl (.Values.st2chatops.image.tag | default .Chart.AppVersion) . }}'
         imagePullPolicy: {{ .Values.st2chatops.image.pullPolicy | default .Values.image.pullPolicy }}
         env:
-        {{- if index .Values.st2chatops "use_api_key" }}
+        {{- if index .Values.st2chatops "api_key" }}
         - name: ST2_API_KEY
           valueFrom:
             secretKeyRef:

templates/secrets_st2auth.yaml

@@ -18,7 +18,7 @@ data:
   username: {{ required "A valid secret 'st2.username' is required for StackStorm auth!" .Values.secrets.st2.username | b64enc | quote }}
   # Password, used to login to StackStorm system (default: Ch@ngeMe)
   password: {{ required "A valid secret 'st2.password' is required for StackStorm auth!" .Values.secrets.st2.password | b64enc | quote }}
-  {{- if index .Values.st2chatops "use_api_key" }}
+  {{- if index .Values.st2chatops "api_key" }}
   # Optional api_key for chatops to use instead of username/password
-  chatops_api_key: {{ required "A valid secret 'st2.chatops_api_key' is required for StackStorm Chatops auth!" .Values.secrets.st2.api_key | b64enc | quote }}
+  chatops_api_key: {{ .Values.st2chatops.api_key | b64enc | quote }}
   {{- end }}

values.yaml

@@ -422,9 +422,9 @@ st2chatops:
   env:
     HUBOT_ADAPTER: slack
     HUBOT_SLACK_TOKEN: xoxb-CHANGE-ME-PLEASE
-  # If use_api_key is true, then use secrets.st2.api_key instead of username/password for chatops
-  # to authenticate with StackStorm.
-  use_api_key: false
+  # If api_key is defined, then use this key instead of username/password for chatops to authenticate with StackStorm.
+  # Please make sure that this key gets added to st2.apikeys above so that chatops can use this key.
+  #api_key:
   # Set custom generated st2chatops Docker image source
   # Otherwise default https://hub.docker.com/r/stackstorm/st2chatops is used
   image: {}