Cleanup the st2chatops diff

Author: armab

.gitignore

@@ -1,2 +1,3 @@
 charts
 *.lock
+.DS_Store

CHANGELOG.md

@@ -44,4 +44,4 @@
 * Add st2packs, - a way to use custom st2 packs as a shareable Docker image via sidecar containers
 
 ## v0.4.0
-* Initial public version, referencing StackStorm Enterprise HA as a Helm chart
+* Initial public version, referencing StackStorm Enterprise HA as a Helm chart

Chart.yaml

@@ -25,4 +25,3 @@ details:
   This Helm chart is a fully installable app that codifies StackStorm cluster optimized for HA and K8s environment.
   By default FOSS community version of st2 will be installed. Enterprise version can be enabled as an option.
   For configuration details check 'values.yaml'.
-  

README.md

@@ -230,4 +230,4 @@ kubectl logs -l release=<release-name>
 Grab all logs only for stackstorm backend services, excluding st2web and DB/MQ/etcd:
 ```
 kubectl logs -l release=<release-name>,tier=backend
-```
+```

requirements.yaml

@@ -20,4 +20,4 @@ dependencies:
     condition: external-dns.enabled
   - name: etcd
     version: 0.6.2
-    repository: https://kubernetes-charts-incubator.storage.googleapis.com/
+    repository: https://kubernetes-charts-incubator.storage.googleapis.com/

templates/_helpers.tpl

@@ -31,4 +31,4 @@ stackstorm
 # Generate '-' prefix only when the variable is defined
 {{- define "hyphenPrefix" -}}
 {{ if . }}-{{ . }}{{end}}
-{{- end -}}
+{{- end -}}

templates/configmaps_chatops.yaml

@@ -16,4 +16,4 @@ metadata:
 data:
 # see configmaps_st2-conf.yaml for indepth explanantion of mappings here. 
 
-{{ toYaml .Values.st2.chatops | indent 4 }}
+{{ toYaml .Values.st2.chatops | indent 4 }}

templates/deployments.yaml

@@ -1380,4 +1380,4 @@ spec:
       volumes:
         - name: st2-chatops-vol
           configMap:
-            name: {{ .Release.Name }}-st2chatops
+            name: {{ .Release.Name }}-st2chatops

templates/jobs.yaml

@@ -394,4 +394,4 @@ spec:
         - name: st2-virtualenvs-vol
           emptyDir: {}
         {{- end }}
-      restartPolicy: OnFailure
+      restartPolicy: OnFailure

templates/secrets_st2apikeys.yaml

@@ -0,0 +1,18 @@
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ .Release.Name }}-st2-apikeys
+  annotations:
+    description: A list of StackStorm API keys with metadata that will be imported into the system
+  labels:
+    app: st2
+    tier: backend
+    vendor: stackstorm
+    support: {{ template "supportMethod" . }}
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    release: "{{ .Release.Name }}"
+    heritage: "{{ .Release.Service }}"
+type: Opaque
+data:
+  apikeys.yaml: {{ toYaml .Values.st2.apikeys | b64enc | quote }}

values.yaml

@@ -355,6 +355,30 @@ st2garbagecollector:
   nodeSelector: {}
   tolerations: []
   affinity: {}
+##
+## StackStorm ChatOps (https://docs.stackstorm.com/chatops/index.html)
+## As hubot can't be HA scaled properly, we deploy only single replica of st2chatops
+##
+st2chatops:
+  # Enable st2chatops (default: false)
+  enabled: true
+  # 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.
+  env:
+    HUBOT_ADAPTER: slack
+    HUBOT_SLACK_TOKEN: xoxb-CHANGE-ME-PLEASE
+  # Use custom generated st2chatops Docker image
+  image:
+  #  repository: stackstorm
+  #  name: st2chatops
+  #  tag: {{ .Chart.AppVersion }}
+  #  pullPolicy: Always
+  resources: {}
+  # Additional advanced settings to control pod/deployment placement
+  nodeSelector: {}
+  tolerations: []
+  affinity: {}
 
 ##
 ## MongoDB HA configuration (3rd party chart dependency)
@@ -434,25 +458,3 @@ external-dns:
   aws:
     zoneType: "public"
   domainFilters: []
-# StackStorm ChatOps (https://docs.stackstorm.com/chatops/index.html)
-# As hubot can't be HA scaled properly, we deploy only single replica of st2chatops
-st2chatops:
-  # Enable st2chatops (default: false)
-  enabled: true
-  # 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.
-  env:
-    HUBOT_ADAPTER: slack
-    HUBOT_SLACK_TOKEN: xoxb-CHANGE-ME-PLEASE
-  # Use custom generated st2chatops Docker image 
-  image:
-  #  repository: stackstorm
-  #  name: st2chatops
-  #  tag: {{ .Chart.AppVersion }}
-  #  pullPolicy: Always
-  resources: {}
-  # Additional advanced settings to control pod/deployment placement
-  nodeSelector: {}
-  tolerations: []
-affinity: {}