diff --git a/charts/README.md b/charts/README.md index 55ef5e62..0dc10871 100644 --- a/charts/README.md +++ b/charts/README.md @@ -48,7 +48,6 @@ The following table lists the configurable parameters of the Fission chart and t | `routerPort` | Fission Router Service Port | `31314` | | `functionNamespace` | Namespace for Fission functions | `fission-function` | | `builderNamespace` | Namespace for Fission environment builders | `fission-builder` | -| `openshift` | RBAC for openshift | `false` | * Extra configuration for `fission-all` diff --git a/charts/fission-all/templates/deployment.yaml b/charts/fission-all/templates/deployment.yaml index ad272c8a..9e565a0c 100644 --- a/charts/fission-all/templates/deployment.yaml +++ b/charts/fission-all/templates/deployment.yaml @@ -1,77 +1,3 @@ -{{ if .Values.openshift }} - -# For openshift - ---- -apiVersion: v1 -kind: ProjectRequest -metadata: - name: fission - labels: - name: fission - ---- -apiVersion: v1 -kind: ProjectRequest -metadata: - name: {{ .Values.functionNamespace }} - labels: - name: fission-function - ---- -apiVersion: v1 -kind: ServiceAccount -metadata: - name: fission-admin - namespace: {{ .Release.Namespace }} - ---- -apiVersion: v1 -kind: ClusterRole -metadata: - name: fission:fission-admin -rules: -- apiGroups: - - extensions - attributeRestrictions: null - resources: - - deployments - verbs: - - create - - get - - list - - update - - watch -- apiGroups: - - "" - attributeRestrictions: null - resources: - - pods - verbs: - - get - - list - - update - ---- -apiVersion: v1 -groupNames: null -kind: RoleBinding -metadata: - name: fission:fission-admin - namespace: {{ .Values.functionNamespace }} -roleRef: - name: fission:fission-admin -subjects: -- kind: ServiceAccount - name: fission-admin - namespace: {{ .Release.Namespace }} -userNames: -- system:serviceaccount:fission:fission-admin - -{{ else }} - -# For all environments except openshift - --- apiVersion: v1 kind: Namespace @@ -183,8 +109,6 @@ roleRef: name: cluster-admin apiGroup: rbac.authorization.k8s.io -{{ end }} - --- apiVersion: extensions/v1beta1 kind: Deployment @@ -573,4 +497,4 @@ spec: claimName: {{ .Values.persistence.existingClaim | default "fission-storage-pvc" }} {{- else }} emptyDir: {} - {{- end -}} \ No newline at end of file + {{- end -}} diff --git a/charts/fission-all/values.yaml b/charts/fission-all/values.yaml index 30d9b044..eb371ca6 100644 --- a/charts/fission-all/values.yaml +++ b/charts/fission-all/values.yaml @@ -38,9 +38,6 @@ functionNamespace: fission-function ## the release namespace) builderNamespace: fission-builder -## Set up openshift RBAC rule -openshift: false - ## Logger config logger: influxdbAdmin: "admin" diff --git a/charts/fission-core/templates/deployment.yaml b/charts/fission-core/templates/deployment.yaml index 5b6b4351..27113700 100644 --- a/charts/fission-core/templates/deployment.yaml +++ b/charts/fission-core/templates/deployment.yaml @@ -1,77 +1,3 @@ -{{ if .Values.openshift }} - -# For openshift - ---- -apiVersion: v1 -kind: ProjectRequest -metadata: - name: fission - labels: - name: fission - ---- -apiVersion: v1 -kind: ProjectRequest -metadata: - name: {{ .Values.functionNamespace }} - labels: - name: fission-function - ---- -apiVersion: v1 -kind: ServiceAccount -metadata: - name: fission-admin - namespace: {{ .Release.Namespace }} - ---- -apiVersion: v1 -kind: ClusterRole -metadata: - name: fission:fission-admin -rules: -- apiGroups: - - extensions - attributeRestrictions: null - resources: - - deployments - verbs: - - create - - get - - list - - update - - watch -- apiGroups: - - "" - attributeRestrictions: null - resources: - - pods - verbs: - - get - - list - - update - ---- -apiVersion: v1 -groupNames: null -kind: RoleBinding -metadata: - name: fission:fission-admin - namespace: {{ .Values.functionNamespace }} -roleRef: - name: fission:fission-admin -subjects: -- kind: ServiceAccount - name: fission-admin - namespace: {{ .Release.Namespace }} -userNames: -- system:serviceaccount:fission:fission-admin - -{{ else }} - -# For all environments except openshift - --- apiVersion: v1 kind: Namespace @@ -183,8 +109,6 @@ roleRef: name: cluster-admin apiGroup: rbac.authorization.k8s.io -{{ end }} - --- apiVersion: extensions/v1beta1 kind: Deployment diff --git a/charts/fission-core/values.yaml b/charts/fission-core/values.yaml index 8c0c003c..8c7b73b0 100644 --- a/charts/fission-core/values.yaml +++ b/charts/fission-core/values.yaml @@ -35,9 +35,6 @@ functionNamespace: fission-function ## the release namespace) builderNamespace: fission-builder -## Set up openshift RBAC rule -openshift: false - ## Persist data to a persistent volume. persistence: enabled: true