feat: Added value to suppress creation of ClusterRole and ClusterRole…

…Bindung. If the value is not set, cluster roles will be created as before
loft-sh · Feb 26, 2024 · fd96b24 · fd96b24
1 parent da4a602
commit fd96b24
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 4 deletions.
diff --git a/charts/eks/templates/_helpers.tpl b/charts/eks/templates/_helpers.tpl
@@ -55,7 +55,7 @@ Whether to create a cluster role or not
     .Values.proxy.metricsServer.nodes.enabled
     .Values.multiNamespaceMode.enabled
     .Values.coredns.plugin.enabled -}}
-{{- true -}}
+{{- .Values.suppressClusterRoleCreation | ternary "" "true" -}}
 {{- end -}}
 {{- end -}}
 

diff --git a/charts/eks/values.yaml b/charts/eks/values.yaml
@@ -333,6 +333,10 @@ serviceAccount:
   # imagePullSecrets:
   #   - name: my-pull-secret
 
+# Prevent Creation of ClusterRole and ClusterRoleBinding by setting this to true. If 
+# not set or false, a ClusterRole and ClsterRoleBinding will be created if needed
+suppressClusterRoleCreation: false
+
 # Service account that should be used by the pods synced by vcluster
 workloadServiceAccount:
   # This is not supported in multi-namespace mode

diff --git a/charts/k0s/templates/_helpers.tpl b/charts/k0s/templates/_helpers.tpl
@@ -55,7 +55,7 @@ Whether to create a cluster role or not
     .Values.proxy.metricsServer.nodes.enabled
     .Values.multiNamespaceMode.enabled
     .Values.coredns.plugin.enabled -}}
-{{- true -}}
+{{- .Values.suppressClusterRoleCreation | ternary "" "true" -}}
 {{- end -}}
 {{- end -}}
 

diff --git a/charts/k0s/values.yaml b/charts/k0s/values.yaml
@@ -215,6 +215,10 @@ serviceAccount:
   # imagePullSecrets:
   #   - name: my-pull-secret
 
+# Prevent Creation of ClusterRole and ClusterRoleBinding by setting this to true. If 
+# not set or false, a ClusterRole and ClusterRoleBinding will be created if needed
+suppressClusterRoleCreation: false
+
 # Service account that should be used by the pods synced by vcluster
 workloadServiceAccount:
   # This is not supported in multi-namespace mode

diff --git a/charts/k3s/templates/_helpers.tpl b/charts/k3s/templates/_helpers.tpl
@@ -55,7 +55,7 @@ Whether to create a cluster role or not
     .Values.proxy.metricsServer.nodes.enabled
     .Values.multiNamespaceMode.enabled
     .Values.coredns.plugin.enabled -}}
-{{- true -}}
+{{- .Values.suppressClusterRoleCreation | ternary "" "true" -}}
 {{- end -}}
 {{- end -}}
 

diff --git a/charts/k3s/values.yaml b/charts/k3s/values.yaml
@@ -235,6 +235,10 @@ serviceAccount:
   # imagePullSecrets:
   #   - name: my-pull-secret
 
+# Prevent Creation of ClusterRole and ClusterRoleBinding by setting this to true. If 
+# not set or false, a ClusterRole and ClusterRoleBinding will be created if needed
+suppressClusterRoleCreation: false
+
 # Service account that should be used by the pods synced by vcluster
 workloadServiceAccount:
   # This is not supported in multi-namespace mode

diff --git a/charts/k8s/templates/_helpers.tpl b/charts/k8s/templates/_helpers.tpl
@@ -55,7 +55,7 @@ Whether to create a cluster role or not
     .Values.proxy.metricsServer.nodes.enabled
     .Values.multiNamespaceMode.enabled
     .Values.coredns.plugin.enabled -}}
-{{- true -}}
+{{- .Values.suppressClusterRoleCreation | ternary "" "true" -}}
 {{- end -}}
 {{- end -}}
 

diff --git a/charts/k8s/values.yaml b/charts/k8s/values.yaml
@@ -271,6 +271,10 @@ serviceAccount:
   # imagePullSecrets:
   #   - name: my-pull-secret
 
+# Prevent Creation of ClusterRole and ClusterRoleBinding by setting this to true. If 
+# not set or false, a ClusterRole and ClsterRoleBinding will be created if needed
+suppressClusterRoleCreation: false
+
 # Service account that should be used by the pods synced by vcluster
 workloadServiceAccount:
   # This is not supported in multi-namespace mode