use list to pass multiple args to labels helpers

Author: cognifloyd

templates/_helpers.tpl

@@ -14,29 +14,33 @@ Create chart name and version as used by the chart label.
 
 {{/*
 Common labels
-Usage: "{{ include "stackstorm-ha.labels" "st2servicename" }}"
+Usage: "{{ include "stackstorm-ha.labels" (list $ "st2servicename") }}"
 */}}
 {{- define "stackstorm-ha.labels" -}}
+{{- $root := index . 0 }}
+{{- $name := index . 1 }}
 {{ include "stackstorm-ha.selectorLabels" . }}
-{{- if list "st2web" "ingress" | has . }}
+{{- if list "st2web" "ingress" | has $name }}
 tier: frontend
-{{- else if eq . "st2tests" }}
+{{- else if eq $name "st2tests" }}
 tier: tests
 {{- else }}
 tier: backend
 {{- end }}
 vendor: stackstorm
-chart: {{ include "stackstorm-ha.chart" $ }}
-heritage: {{ $.Release.Service }}
+chart: {{ include "stackstorm-ha.chart" $root }}
+heritage: {{ $root.Release.Service }}
 {{- end -}}
 
 {{/*
 Selector labels
-Usage: "{{ include "stackstorm-ha.selectorLabels" "st2servicename" }}"
+Usage: "{{ include "stackstorm-ha.selectorLabels" (list $ "st2servicename") }}"
 */}}
 {{- define "stackstorm-ha.selectorLabels" -}}
-app: {{ . }}
-release: {{ $.Release.Name }}
+{{- $root := index . 0 }}
+{{- $name := index . 1 }}
+app: {{ $name }}
+release: {{ $root.Release.Name }}
 {{- end -}}
 
 {{/*

templates/configmaps_packs.yaml

@@ -5,6 +5,6 @@ metadata:
   name: {{ .Release.Name }}-st2-pack-configs
   annotations:
     description: StackStorm pack configs defined in helm values, shipped in (or copied to) '/opt/stackstorm/configs/'
-  labels: {{- include "stackstorm-ha.labels" "st2" | nindent 4 }}
+  labels: {{- include "stackstorm-ha.labels" (list $ "st2") | nindent 4 }}
 data:
 {{ toYaml .Values.st2.packs.configs | indent 2 }}

templates/configmaps_post-start-script.yaml

@@ -7,7 +7,7 @@ metadata:
   name: {{ $.Release.Name }}-{{ . }}-post-start-script
   annotations:
     description: Custom postStart lifecycle event handler script for {{ . }}
-  labels: {{- include "stackstorm-ha.labels" "st2" | nindent 4 }}
+  labels: {{- include "stackstorm-ha.labels" (list $ "st2") | nindent 4 }}
 data:
   # k8s calls this script in parallel with starting {{ . }} (ie the same time as ENTRYPOINT)
   # The pod will not be marked as "running" until this script completes successfully.

templates/configmaps_rbac.yaml

@@ -6,7 +6,7 @@ metadata:
   name: {{ .Release.Name }}-st2-rbac-roles
   annotations:
     description: Custom StackStorm RBAC roles, shipped in '/opt/stackstorm/rbac/roles/'
-  labels: {{- include "stackstorm-ha.labels" "st2" | nindent 4 }}
+  labels: {{- include "stackstorm-ha.labels" (list $ "st2") | nindent 4 }}
 data:
 {{- range $filename, $contents := .Values.st2.rbac.roles }}
   {{/* to support removing default files, skip files with empty contents */}}
@@ -23,7 +23,7 @@ metadata:
   name: {{ .Release.Name }}-st2-rbac-assignments
   annotations:
     description: Custom StackStorm RBAC role assignments, shipped in '/opt/stackstorm/rbac/assignments/'
-  labels: {{- include "stackstorm-ha.labels" "st2" | nindent 4 }}
+  labels: {{- include "stackstorm-ha.labels" (list $ "st2") | nindent 4 }}
 data:
 {{- range $filename, $contents := .Values.st2.rbac.assignments }}
   {{/* to support removing default files, skip files with empty contents */}}
@@ -40,7 +40,7 @@ metadata:
   name: {{ .Release.Name }}-st2-rbac-mappings
   annotations:
     description: StackStorm RBAC LDAP groups-to-roles mapping rules, shipped in '/opt/stackstorm/rbac/mappings/'
-  labels: {{- include "stackstorm-ha.labels" "st2" | nindent 4 }}
+  labels: {{- include "stackstorm-ha.labels" (list $ "st2") | nindent 4 }}
 data:
 {{- if .Values.st2.rbac.mappings }}
 {{ toYaml .Values.st2.rbac.mappings | indent 2 }}

templates/configmaps_st2-conf.yaml

@@ -5,7 +5,7 @@ metadata:
   name: {{ .Release.Name }}-st2-config
   annotations:
     description: Custom StackStorm config which will apply settings on top of default st2.conf
-  labels: {{- include "stackstorm-ha.labels" "st2" | nindent 4 }}
+  labels: {{- include "stackstorm-ha.labels" (list $ "st2") | nindent 4 }}
 data:
   # TODO: Bundle DB/MQ login secrets in dynamic ENV-based st2.secrets.conf, leave custom user-defined settings for st2.user.conf (?)
   # Docker/K8s-based st2 config file used for templating service names and common overrides on top of original st2.conf.

templates/configmaps_st2-urls.yaml

@@ -5,7 +5,7 @@ metadata:
   name: {{ .Release.Name }}-st2-urls
   annotations:
     description: StackStorm service URLs, used across entire st2 cluster
-  labels: {{- include "stackstorm-ha.labels" "st2" | nindent 4 }}
+  labels: {{- include "stackstorm-ha.labels" (list $ "st2") | nindent 4 }}
 data:
   ST2_AUTH_URL: http://{{ .Release.Name }}-st2auth:9100/
   ST2_API_URL: http://{{ .Release.Name }}-st2api:9101/

templates/configmaps_st2web.yaml

@@ -6,7 +6,7 @@ metadata:
   name: {{ .Release.Name }}-st2web-config
   annotations:
     description: Custom StackStorm Web config which will override defaults
-  labels: {{- include "stackstorm-ha.labels" "st2" | nindent 4 }}
+  labels: {{- include "stackstorm-ha.labels" (list $ "st2") | nindent 4 }}
 data:
   # User-defined st2web config with custom settings to replace default config.js
   # See https://github.com/StackStorm/st2web#connecting-to-st2-server for more info