Removing Support Method tags

Moving rbac under st2 and adding flags to enable/disable rbac

Author: hanancha

templates/_helpers.tpl

@@ -3,12 +3,7 @@
 {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
-# Generate support method used in labels. This is based on community
-{{- define "supportMethod" -}}
-community
-{{- end }}
-
-# Generate Docker image repository: Private 'docker.stackstorm.com' for Enterprise vs Public Docker Hub 'stackstorm' for FOSS version
+# Generate Docker image repository: Public Docker Hub 'stackstorm' for FOSS version
 {{- define "imageRepository" -}}
 {{- if .Values.image.repository -}}
 {{ .Values.image.repository }}

templates/configmaps_packs.yaml

@@ -9,7 +9,6 @@ metadata:
     app: st2
     tier: backend
     vendor: stackstorm
-    support: {{ template "supportMethod" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}

templates/configmaps_rbac.yaml

@@ -1,3 +1,4 @@
+{{- if .Values.st2.rbac.enabled -}}
 ---
 apiVersion: v1
 kind: ConfigMap
@@ -9,7 +10,6 @@ metadata:
     app: st2
     tier: backend
     vendor: stackstorm
-    support: {{ template "supportMethod" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
@@ -27,7 +27,6 @@ metadata:
     app: st2
     tier: backend
     vendor: stackstorm
-    support: {{ template "supportMethod" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
@@ -45,7 +44,6 @@ metadata:
     app: st2
     tier: backend
     vendor: stackstorm
-    support: {{ template "supportMethod" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
@@ -55,3 +53,4 @@ data:
 {{ else }}
   {}
 {{ end }}
+{{- end }}

templates/configmaps_st2-conf.yaml

@@ -9,7 +9,6 @@ metadata:
     app: st2
     tier: backend
     vendor: stackstorm
-    support: {{ template "supportMethod" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}

templates/configmaps_st2-urls.yaml

@@ -9,7 +9,6 @@ metadata:
     app: st2
     tier: backend
     vendor: stackstorm
-    support: {{ template "supportMethod" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}

templates/configmaps_st2web.yaml

@@ -10,7 +10,6 @@ metadata:
     app: st2
     tier: backend
     vendor: stackstorm
-    support: {{ template "supportMethod" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}