Added option to disable cluster resources

charts/fission-core/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v1
 name: fission-core
-version: 1.8.1-pre1
+version: 1.8.1-pre2
 description: Fission is a fast serverless framework for Kubernetes.
 keywords:
 - fission

charts/fission-core/templates/deployment.yaml

@@ -23,6 +23,7 @@ metadata:
     {{- end }}
 {{- end }}
 
+{{- if .Values.createClusterResources }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
@@ -54,6 +55,22 @@ rules:
   - watch
   - list
 
+---
+kind: ClusterRoleBinding
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: fission-crd
+subjects:
+- kind: ServiceAccount
+  name: fission-svc
+  namespace: {{ .Release.Namespace }}
+roleRef:
+  kind: ClusterRole
+  name: cluster-admin
+  apiGroup: rbac.authorization.k8s.io
+
+{{- end }}
+
 ---
 apiVersion: v1
 kind: ServiceAccount
@@ -76,20 +93,6 @@ roleRef:
   name: admin
   apiGroup: rbac.authorization.k8s.io
 
----
-kind: ClusterRoleBinding
-apiVersion: rbac.authorization.k8s.io/v1
-metadata:
-  name: fission-crd
-subjects:
-- kind: ServiceAccount
-  name: fission-svc
-  namespace: {{ .Release.Namespace }}
-roleRef:
-  kind: ClusterRole
-  name: cluster-admin
-  apiGroup: rbac.authorization.k8s.io
-
 ---
 apiVersion: v1
 kind: ServiceAccount

charts/fission-core/values.yaml

@@ -39,6 +39,16 @@ builderNamespace: fission-builder
 ## Enable istio integration
 enableIstio: false
 
+# In clusters with multiple fission instances, helm will complain about pre-existing resources
+# Set the following to false to avoid (re)creating any cluster-scoped resources.
+# It's then up to you to ensure that the necessary clusterresources are created'
+createClusterResources: true
+
+# Whether or not to create namespaces for builder/fetcher as part of the helm install
+# In some configurations, a service account may have privilegdes to deploy into a namespace, but not
+# to create additional namespaces (so the namespaces must be pre-prepared)
+createNamespace: true
+
 fetcher:
   ## Fetcher repository
   image: fission/fetcher