Merge pull request #7 from cwilson21/testing

Updating things from override to overrides

Author: cwilson21

templates/_helpers.tpl

@@ -212,14 +212,14 @@ define this here as well to simplify comparison with packs-volume-mounts
 
 #Inserted for override ability to happen via helm charts
 
-{{- define "stackstorm-ha.override-config-mounts" -}}
+{{- define "stackstorm-ha.overrides-config-mounts" -}}
   {{- if .Values.st2.overrides }}
 - name: st2-overrides-vol
   mountPath: /opt/stackstorm/overrides/
   {{- end }}
 {{- end -}}
 
-{{- define "stackstorm-ha.override-configs" -}}
+{{- define "stackstorm-ha.overrides-configs" -}}
   {{- if .Values.st2.overrides }}
 - name: st2-overrides-vol
   configMap:

templates/configmaps_overrides.yaml

@@ -3,7 +3,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ .Release.Name }}-st2-override-configs
+  name: {{ .Release.Name }}-st2-overrides-configs
   annotations:
     description: StackStorm override configs defined in helm values, shipped in (or copied to) '/opt/stackstorm/overrides'
   labels:

templates/deployments.yaml

@@ -1776,7 +1776,7 @@ spec:
         - name: st2-rbac-mappings-vol
           mountPath: /opt/stackstorm/rbac/mappings/
         {{- end }}
-        {{- include "stackstorm-ha.override-config-mounts" . | nindent 8 }}
+        {{- include "stackstorm-ha.overrides-config-mounts" . | nindent 8 }}
         - name: st2client-config-vol
           mountPath: /root/.st2/
         - name: st2-ssh-key-vol
@@ -1828,7 +1828,7 @@ spec:
           configMap:
             name: {{ .Release.Name }}-st2-rbac-mappings
         {{- end }}
-        {{- include "stackstorm-ha.override-configs" . | nindent 8 }}
+        {{- include "stackstorm-ha.overrides-configs" . | nindent 8 }}
         - name: st2client-config-vol
           emptyDir:
             medium: Memory

templates/jobs.yaml

@@ -477,14 +477,14 @@ spec:
         {{- end }}
         {{- end }}
         volumeMounts:
-        {{- include "stackstorm-ha.override-config-mounts" . | nindent 8 }}
+        {{- include "stackstorm-ha.overrides-config-mounts" . | nindent 8 }}
         {{- include "stackstorm-ha.st2-config-volume-mounts" . | nindent 8 }}
         {{- include "stackstorm-ha.packs-volume-mounts-for-register-job" . | nindent 8 }}
         {{- include "stackstorm-ha.pack-configs-volume-mount" . | nindent 8 }}
         # TODO: Find out default resource limits for this specific service (#5)
         #resources:
       volumes:
-        {{- include "stackstorm-ha.override-configs" . | nindent 8 }}
+        {{- include "stackstorm-ha.overrides-configs" . | nindent 8 }}
         {{- include "stackstorm-ha.st2-config-volume" . | nindent 8 }}
         {{- include "stackstorm-ha.packs-volumes" . | nindent 8 }}
         {{- include "stackstorm-ha.pack-configs-volume" . | nindent 8 }}
@@ -613,7 +613,7 @@ spec:
         volumeMounts:
         - name: st2client-config-vol
           mountPath: /root/.st2/
-        {{- include "stackstorm-ha.override-config-mounts" $ | nindent 8 }}
+        {{- include "stackstorm-ha.overrides-config-mounts" $ | nindent 8 }}
         {{- include "stackstorm-ha.st2-config-volume-mounts" $ | nindent 8 }}
         {{- include "stackstorm-ha.packs-volume-mounts-for-register-job" $ | nindent 8 }}
         {{- include "stackstorm-ha.pack-configs-volume-mount" $ | nindent 8 }}
@@ -624,7 +624,7 @@ spec:
         - name: st2client-config-vol
           emptyDir:
             medium: Memory
-        {{- include "stackstorm-ha.override-configs" $ | nindent 8 }}
+        {{- include "stackstorm-ha.overrides-configs" $ | nindent 8 }}
         {{- include "stackstorm-ha.st2-config-volume" $ | nindent 8 }}
         {{- include "stackstorm-ha.packs-volumes" $ | nindent 8 }}
         {{- include "stackstorm-ha.pack-configs-volume" $ | nindent 8 }}