Removing enterprise flags form rbac configs

Author: hanancha

templates/configmaps_rbac.yaml

@@ -1,4 +1,3 @@
-{{ if .Values.enterprise.enabled }}
 ---
 apiVersion: v1
 kind: ConfigMap
@@ -10,12 +9,12 @@ metadata:
     app: st2
     tier: backend
     vendor: stackstorm
-    support: enterprise
+    support: {{ template "supportMethod" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
 data:
-{{ toYaml .Values.enterprise.rbac.roles | indent 2 }}
+{{ toYaml .Values.rbac.roles | indent 2 }}
 
 ---
 apiVersion: v1
@@ -28,12 +27,12 @@ metadata:
     app: st2
     tier: backend
     vendor: stackstorm
-    support: enterprise
+    support: {{ template "supportMethod" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
 data:
-{{ toYaml .Values.enterprise.rbac.assignments | indent 2 }}
+{{ toYaml .Values.rbac.assignments | indent 2 }}
 
 ---
 apiVersion: v1
@@ -46,14 +45,13 @@ metadata:
     app: st2
     tier: backend
     vendor: stackstorm
-    support: enterprise
+    support: {{ template "supportMethod" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
 data:
-{{- if .Values.enterprise.rbac.mappings }}
-{{ toYaml .Values.enterprise.rbac.mappings | indent 2 }}
+{{- if .Values.rbac.mappings }}
+{{ toYaml .Values.rbac.mappings | indent 2 }}
 {{ else }}
   {}
 {{ end }}
-{{ end }}

values.yaml

@@ -28,40 +28,40 @@ enterprise:
   # Don't have one? Obtain 90-day free trial at https://stackstorm.com/#product
   license: ""
 
-  # StackStorm Role Based Access Control settings (https://docs.stackstorm.com/rbac.html)
-  rbac:
-    # Custom StackStorm RBAC roles, shipped in '/opt/stackstorm/rbac/roles/'
-    # See https://docs.stackstorm.com/rbac.html#defining-roles-and-permission-grants
-    roles:
-      sample.yaml: |
-        # sample RBAC role file, see https://docs.stackstorm.com/rbac.html#defining-roles-and-permission-grants
-        ---
-        name: "sample"
-        description: "Example Role which contains no permission grants and serves for demonstration purposes"
+# StackStorm Role Based Access Control settings (https://docs.stackstorm.com/rbac.html)
+rbac:
+  # Custom StackStorm RBAC roles, shipped in '/opt/stackstorm/rbac/roles/'
+  # See https://docs.stackstorm.com/rbac.html#defining-roles-and-permission-grants
+  roles:
+    sample.yaml: |
+      # sample RBAC role file, see https://docs.stackstorm.com/rbac.html#defining-roles-and-permission-grants
+      ---
+      name: "sample"
+      description: "Example Role which contains no permission grants and serves for demonstration purposes"
 
-    # Custom StackStorm RBAC role assignments, shipped in '/opt/stackstorm/rbac/assignments/'
-    # See: https://docs.stackstorm.com/rbac.html#defining-user-role-assignments
-    assignments:
-      st2admin.yaml: |
-        ---
-        username: st2admin
-        roles:
-          - system_admin
-      stanley.yaml: |
-        ---
-        username: stanley
-        roles:
-          - admin
+  # Custom StackStorm RBAC role assignments, shipped in '/opt/stackstorm/rbac/assignments/'
+  # See: https://docs.stackstorm.com/rbac.html#defining-user-role-assignments
+  assignments:
+    st2admin.yaml: |
+      ---
+      username: st2admin
+      roles:
+        - system_admin
+    stanley.yaml: |
+      ---
+      username: stanley
+      roles:
+        - admin
 
-    # StackStorm RBAC LDAP groups-to-roles mapping rules, shipped in '/opt/stackstorm/rbac/mappings/'
-    # See RBAC Roles Based on LDAP Groups: https://docs.stackstorm.com/rbac.html#automatically-granting-roles-based-on-ldap-group-membership
-    mappings:
-      #stormers.yaml: |
-      #  ---
-      #  group: "CN=stormers,OU=groups,DC=stackstorm,DC=net"
-      #  description: "Automatically grant admin role to all stormers group members."
-      #  roles:
-      #    - "admin"
+  # StackStorm RBAC LDAP groups-to-roles mapping rules, shipped in '/opt/stackstorm/rbac/mappings/'
+  # See RBAC Roles Based on LDAP Groups: https://docs.stackstorm.com/rbac.html#automatically-granting-roles-based-on-ldap-group-membership
+  mappings:
+    #stormers.yaml: |
+    #  ---
+    #  group: "CN=stormers,OU=groups,DC=stackstorm,DC=net"
+    #  description: "Automatically grant admin role to all stormers group members."
+    #  roles:
+    #    - "admin"
 
 ##
 ## Service Account