diff --git a/charts/fission-all/templates/_helpers.tpl b/charts/fission-all/templates/_helpers.tpl index a0988442..b01c6721 100644 --- a/charts/fission-all/templates/_helpers.tpl +++ b/charts/fission-all/templates/_helpers.tpl @@ -74,7 +74,7 @@ This template generates the image name for the deployment depending on the value {{- define "fission-resource-namespace.envs" }} - name: FISSION_RESOURCE_NAMESPACES -{{- if not .Values.singleDefaultNamespace }} +{{- if gt (len .Values.additionalFissionNamespaces) 0 }} value: "{{ .Values.defaultNamespace }},{{ join "," .Values.additionalFissionNamespaces }}" {{- else }} value: {{ .Values.defaultNamespace }} diff --git a/charts/fission-all/templates/buildermgr/role-fission-cr.yaml b/charts/fission-all/templates/buildermgr/role-fission-cr.yaml index 814ae691..eacaa1ca 100644 --- a/charts/fission-all/templates/buildermgr/role-fission-cr.yaml +++ b/charts/fission-all/templates/buildermgr/role-fission-cr.yaml @@ -1,6 +1,6 @@ {{- include "fission-role-generator" (merge (dict "namespace" .Values.defaultNamespace "component" "buildermgr") .) }} -{{- if not .Values.singleDefaultNamespace }} +{{- if gt (len .Values.additionalFissionNamespaces) 0 }} {{- range $namespace := $.Values.additionalFissionNamespaces }} {{ include "fission-role-generator" (merge (dict "namespace" $namespace "component" "buildermgr") $) }} {{- end }} diff --git a/charts/fission-all/templates/buildermgr/role-kubernetes.yaml b/charts/fission-all/templates/buildermgr/role-kubernetes.yaml index b33e2217..59544b11 100644 --- a/charts/fission-all/templates/buildermgr/role-kubernetes.yaml +++ b/charts/fission-all/templates/buildermgr/role-kubernetes.yaml @@ -1,6 +1,6 @@ {{- include "kubernetes-role-generator" (merge (dict "namespace" .Values.defaultNamespace "component" "buildermgr") .) }} -{{- if not .Values.singleDefaultNamespace }} +{{- if gt (len .Values.additionalFissionNamespaces) 0 }} {{- range $namespace := $.Values.additionalFissionNamespaces }} {{ include "kubernetes-role-generator" (merge (dict "namespace" $namespace "component" "buildermgr") $) }} {{- end }} diff --git a/charts/fission-all/templates/canary-config/role-fission-cr.yaml b/charts/fission-all/templates/canary-config/role-fission-cr.yaml index e1a23288..eaa958c4 100644 --- a/charts/fission-all/templates/canary-config/role-fission-cr.yaml +++ b/charts/fission-all/templates/canary-config/role-fission-cr.yaml @@ -1,7 +1,7 @@ {{- if .Values.canaryDeployment.enabled }} {{- include "fission-role-generator" (merge (dict "namespace" .Values.defaultNamespace "component" "canaryconfig") .) }} -{{- if not .Values.singleDefaultNamespace }} +{{- if gt (len .Values.additionalFissionNamespaces) 0 }} {{- range $namespace := $.Values.additionalFissionNamespaces }} {{ include "fission-role-generator" (merge (dict "namespace" $namespace "component" "canaryconfig") $) }} {{- end }} diff --git a/charts/fission-all/templates/canary-config/role-kubernetes.yaml b/charts/fission-all/templates/canary-config/role-kubernetes.yaml index da32590f..a0baa64d 100644 --- a/charts/fission-all/templates/canary-config/role-kubernetes.yaml +++ b/charts/fission-all/templates/canary-config/role-kubernetes.yaml @@ -1,7 +1,7 @@ {{- if .Values.canaryDeployment.enabled }} {{- include "kubernetes-role-generator" (merge (dict "namespace" .Values.defaultNamespace "component" "canaryconfig") .) }} -{{- if not .Values.singleDefaultNamespace }} +{{- if gt (len .Values.additionalFissionNamespaces) 0 }} {{- range $namespace := $.Values.additionalFissionNamespaces }} {{ include "kubernetes-role-generator" (merge (dict "namespace" $namespace "component" "canaryconfig") $) }} {{- end }} diff --git a/charts/fission-all/templates/controller/role-fission-cr.yaml b/charts/fission-all/templates/controller/role-fission-cr.yaml index c4658959..1704dba9 100644 --- a/charts/fission-all/templates/controller/role-fission-cr.yaml +++ b/charts/fission-all/templates/controller/role-fission-cr.yaml @@ -1,7 +1,7 @@ {{- if .Values.controller.enabled }} {{- include "fission-role-generator" (merge (dict "namespace" .Values.defaultNamespace "component" "controller") .) }} -{{- if not .Values.singleDefaultNamespace }} +{{- if gt (len .Values.additionalFissionNamespaces) 0 }} {{- range $namespace := $.Values.additionalFissionNamespaces }} {{ include "fission-role-generator" (merge (dict "namespace" $namespace "component" "controller") $) }} {{- end }} diff --git a/charts/fission-all/templates/controller/role-kubernetes.yaml b/charts/fission-all/templates/controller/role-kubernetes.yaml index f00fc113..793db48a 100644 --- a/charts/fission-all/templates/controller/role-kubernetes.yaml +++ b/charts/fission-all/templates/controller/role-kubernetes.yaml @@ -1,6 +1,6 @@ {{- include "kubernetes-role-generator" (merge (dict "namespace" .Values.defaultNamespace "component" "controller") .) }} -{{- if not .Values.singleDefaultNamespace }} +{{- if gt (len .Values.additionalFissionNamespaces) 0 }} {{- range $namespace := $.Values.additionalFissionNamespaces }} {{ include "kubernetes-role-generator" (merge (dict "namespace" $namespace "component" "controller") $) }} {{- end }} diff --git a/charts/fission-all/templates/executor/role-fission-cr.yaml b/charts/fission-all/templates/executor/role-fission-cr.yaml index 8070b591..d434e275 100644 --- a/charts/fission-all/templates/executor/role-fission-cr.yaml +++ b/charts/fission-all/templates/executor/role-fission-cr.yaml @@ -1,6 +1,6 @@ {{- include "fission-role-generator" (merge (dict "namespace" .Values.defaultNamespace "component" "executor") .) }} -{{- if not .Values.singleDefaultNamespace }} +{{- if gt (len .Values.additionalFissionNamespaces) 0 }} {{- range $namespace := $.Values.additionalFissionNamespaces }} {{ include "fission-role-generator" (merge (dict "namespace" $namespace "component" "executor") $) }} {{- end }} diff --git a/charts/fission-all/templates/executor/role-kubernetes.yaml b/charts/fission-all/templates/executor/role-kubernetes.yaml index 479d563b..8b0bfb17 100644 --- a/charts/fission-all/templates/executor/role-kubernetes.yaml +++ b/charts/fission-all/templates/executor/role-kubernetes.yaml @@ -1,6 +1,6 @@ {{- include "kubernetes-role-generator" (merge (dict "namespace" .Values.defaultNamespace "component" "executor") .) }} -{{- if not .Values.singleDefaultNamespace }} +{{- if gt (len .Values.additionalFissionNamespaces) 0 }} {{- range $namespace := $.Values.additionalFissionNamespaces }} {{ include "kubernetes-role-generator" (merge (dict "namespace" $namespace "component" "executor") $) }} {{- end }} diff --git a/charts/fission-all/templates/fluentbit/role-kubernetes.yaml b/charts/fission-all/templates/fluentbit/role-kubernetes.yaml index 6e8f12fc..b8d263f9 100644 --- a/charts/fission-all/templates/fluentbit/role-kubernetes.yaml +++ b/charts/fission-all/templates/fluentbit/role-kubernetes.yaml @@ -1,6 +1,6 @@ {{- include "kubernetes-role-generator" (merge (dict "namespace" .Values.defaultNamespace "component" "fluentbit") .) }} -{{- if not .Values.singleDefaultNamespace }} +{{- if gt (len .Values.additionalFissionNamespaces) 0 }} {{- range $namespace := $.Values.additionalFissionNamespaces }} {{ include "kubernetes-role-generator" (merge (dict "namespace" $namespace "component" "fluentbit") $) }} {{- end }} diff --git a/charts/fission-all/templates/kubewatcher/role-fission-cr.yaml b/charts/fission-all/templates/kubewatcher/role-fission-cr.yaml index 202a7167..7494c3a5 100644 --- a/charts/fission-all/templates/kubewatcher/role-fission-cr.yaml +++ b/charts/fission-all/templates/kubewatcher/role-fission-cr.yaml @@ -1,6 +1,6 @@ {{- include "fission-role-generator" (merge (dict "namespace" .Values.defaultNamespace "component" "kubewatcher") .) }} -{{- if not .Values.singleDefaultNamespace }} +{{- if gt (len .Values.additionalFissionNamespaces) 0 }} {{- range $namespace := $.Values.additionalFissionNamespaces }} {{ include "fission-role-generator" (merge (dict "namespace" $namespace "component" "kubewatcher") $) }} {{- end }} diff --git a/charts/fission-all/templates/kubewatcher/role-kubernetes.yaml b/charts/fission-all/templates/kubewatcher/role-kubernetes.yaml index 340248d5..73f2ced3 100644 --- a/charts/fission-all/templates/kubewatcher/role-kubernetes.yaml +++ b/charts/fission-all/templates/kubewatcher/role-kubernetes.yaml @@ -1,6 +1,6 @@ {{- include "kubernetes-role-generator" (merge (dict "namespace" .Values.defaultNamespace "component" "kubewatcher") .) }} -{{- if not .Values.singleDefaultNamespace }} +{{- if gt (len .Values.additionalFissionNamespaces) 0 }} {{- range $namespace := $.Values.additionalFissionNamespaces }} {{ include "kubernetes-role-generator" (merge (dict "namespace" $namespace "component" "kubewatcher") $) }} {{- end }} diff --git a/charts/fission-all/templates/misc-functions/role.yaml b/charts/fission-all/templates/misc-functions/role.yaml index ce74d2cc..3c02421d 100644 --- a/charts/fission-all/templates/misc-functions/role.yaml +++ b/charts/fission-all/templates/misc-functions/role.yaml @@ -5,7 +5,7 @@ can be used */}} {{ include "fissionFunction.roles" (merge (dict "namespace" .Values.defaultNamespace) .) }} -{{- if not .Values.singleDefaultNamespace }} +{{- if gt (len .Values.additionalFissionNamespaces) 0 }} {{- range $namespace := $.Values.additionalFissionNamespaces }} {{ include "fissionFunction.roles" (merge (dict "namespace" $namespace) $) }} {{- end }} diff --git a/charts/fission-all/templates/misc-functions/rolebinding.yaml b/charts/fission-all/templates/misc-functions/rolebinding.yaml index 18023e87..21f36fe5 100644 --- a/charts/fission-all/templates/misc-functions/rolebinding.yaml +++ b/charts/fission-all/templates/misc-functions/rolebinding.yaml @@ -5,7 +5,7 @@ can be used */}} {{ include "fissionFunction.rolebindings" (merge (dict "namespace" .Values.defaultNamespace) .) }} -{{- if not .Values.singleDefaultNamespace }} +{{- if gt (len .Values.additionalFissionNamespaces) 0 }} {{- range $namespace := $.Values.additionalFissionNamespaces }} {{ include "fissionFunction.rolebindings" (merge (dict "namespace" $namespace) $) }} {{- end }} diff --git a/charts/fission-all/templates/mqt-fission-kafka/role-fission-cr.yaml b/charts/fission-all/templates/mqt-fission-kafka/role-fission-cr.yaml index d74acec8..8844112c 100644 --- a/charts/fission-all/templates/mqt-fission-kafka/role-fission-cr.yaml +++ b/charts/fission-all/templates/mqt-fission-kafka/role-fission-cr.yaml @@ -1,6 +1,6 @@ {{- include "fission-role-generator" (merge (dict "namespace" .Values.defaultNamespace "component" "kafka") .) }} -{{- if not .Values.singleDefaultNamespace }} +{{- if gt (len .Values.additionalFissionNamespaces) 0 }} {{- range $namespace := $.Values.additionalFissionNamespaces }} {{ include "fission-role-generator" (merge (dict "namespace" $namespace "component" "kafka") $) }} {{- end }} diff --git a/charts/fission-all/templates/mqt-fission-kafka/role-kubernetes.yaml b/charts/fission-all/templates/mqt-fission-kafka/role-kubernetes.yaml index b8895ca9..f91facd5 100644 --- a/charts/fission-all/templates/mqt-fission-kafka/role-kubernetes.yaml +++ b/charts/fission-all/templates/mqt-fission-kafka/role-kubernetes.yaml @@ -1,6 +1,6 @@ {{- include "kubernetes-role-generator" (merge (dict "namespace" .Values.defaultNamespace "component" "kafka") .) }} -{{- if not .Values.singleDefaultNamespace }} +{{- if gt (len .Values.additionalFissionNamespaces) 0 }} {{- range $namespace := $.Values.additionalFissionNamespaces }} {{ include "kubernetes-role-generator" (merge (dict "namespace" $namespace "component" "kafka") $) }} {{- end }} diff --git a/charts/fission-all/templates/mqt-keda/role-fission-cr.yaml b/charts/fission-all/templates/mqt-keda/role-fission-cr.yaml index b7eec7d9..b159b336 100644 --- a/charts/fission-all/templates/mqt-keda/role-fission-cr.yaml +++ b/charts/fission-all/templates/mqt-keda/role-fission-cr.yaml @@ -1,6 +1,6 @@ {{- include "fission-role-generator" (merge (dict "namespace" .Values.defaultNamespace "component" "keda") .) }} -{{- if not .Values.singleDefaultNamespace }} +{{- if gt (len .Values.additionalFissionNamespaces) 0 }} {{- range $namespace := $.Values.additionalFissionNamespaces }} {{ include "fission-role-generator" (merge (dict "namespace" $namespace "component" "keda") $) }} {{- end }} diff --git a/charts/fission-all/templates/mqt-keda/role-kubernetes.yaml b/charts/fission-all/templates/mqt-keda/role-kubernetes.yaml index 5fa35fd9..9434a8f5 100644 --- a/charts/fission-all/templates/mqt-keda/role-kubernetes.yaml +++ b/charts/fission-all/templates/mqt-keda/role-kubernetes.yaml @@ -1,6 +1,6 @@ {{- include "kubernetes-role-generator" (merge (dict "namespace" .Values.defaultNamespace "component" "keda") .) }} -{{- if not .Values.singleDefaultNamespace }} +{{- if gt (len .Values.additionalFissionNamespaces) 0 }} {{- range $namespace := $.Values.additionalFissionNamespaces }} {{ include "kubernetes-role-generator" (merge (dict "namespace" $namespace "component" "keda") $) }} {{- end }} diff --git a/charts/fission-all/templates/pre-upgrade-checks/role-fission-cr.yaml b/charts/fission-all/templates/pre-upgrade-checks/role-fission-cr.yaml index d6393b8c..1ecd7cda 100644 --- a/charts/fission-all/templates/pre-upgrade-checks/role-fission-cr.yaml +++ b/charts/fission-all/templates/pre-upgrade-checks/role-fission-cr.yaml @@ -1,6 +1,6 @@ {{- include "fission-role-generator" (merge (dict "namespace" .Values.defaultNamespace "component" "preupgrade") .) }} -{{- if not .Values.singleDefaultNamespace }} +{{- if gt (len .Values.additionalFissionNamespaces) 0 }} {{- range $namespace := $.Values.additionalFissionNamespaces }} {{ include "fission-role-generator" (merge (dict "namespace" $namespace "component" "preupgrade") $) }} {{- end }} diff --git a/charts/fission-all/templates/router/role-fission-cr.yaml b/charts/fission-all/templates/router/role-fission-cr.yaml index 35b40707..47fdae75 100644 --- a/charts/fission-all/templates/router/role-fission-cr.yaml +++ b/charts/fission-all/templates/router/role-fission-cr.yaml @@ -1,6 +1,6 @@ {{- include "fission-role-generator" (merge (dict "namespace" .Values.defaultNamespace "component" "router") .) }} -{{- if not .Values.singleDefaultNamespace }} +{{- if gt (len .Values.additionalFissionNamespaces) 0 }} {{- range $namespace := $.Values.additionalFissionNamespaces }} {{ include "fission-role-generator" (merge (dict "namespace" $namespace "component" "router") $) }} {{- end }} diff --git a/charts/fission-all/templates/router/role-kubernetes.yaml b/charts/fission-all/templates/router/role-kubernetes.yaml index 13ab45d1..27a38951 100644 --- a/charts/fission-all/templates/router/role-kubernetes.yaml +++ b/charts/fission-all/templates/router/role-kubernetes.yaml @@ -1,6 +1,6 @@ {{- include "kubernetes-role-generator" (merge (dict "namespace" .Values.defaultNamespace "component" "router") .) }} -{{- if not .Values.singleDefaultNamespace }} +{{- if gt (len .Values.additionalFissionNamespaces) 0 }} {{- range $namespace := $.Values.additionalFissionNamespaces }} {{ include "kubernetes-role-generator" (merge (dict "namespace" $namespace "component" "router") $) }} {{- end }} diff --git a/charts/fission-all/templates/storagesvc/role-fission-cr.yaml b/charts/fission-all/templates/storagesvc/role-fission-cr.yaml index 3f2ff4f8..afc5f62f 100644 --- a/charts/fission-all/templates/storagesvc/role-fission-cr.yaml +++ b/charts/fission-all/templates/storagesvc/role-fission-cr.yaml @@ -1,6 +1,6 @@ {{- include "fission-role-generator" (merge (dict "namespace" .Values.defaultNamespace "component" "storagesvc") .) }} -{{- if not .Values.singleDefaultNamespace }} +{{- if gt (len .Values.additionalFissionNamespaces) 0 }} {{- range $namespace := $.Values.additionalFissionNamespaces }} {{ include "fission-role-generator" (merge (dict "namespace" $namespace "component" "storagesvc") $) }} {{- end }} diff --git a/charts/fission-all/templates/timer/role-fission-cr.yaml b/charts/fission-all/templates/timer/role-fission-cr.yaml index 3bf05adc..60f8f713 100644 --- a/charts/fission-all/templates/timer/role-fission-cr.yaml +++ b/charts/fission-all/templates/timer/role-fission-cr.yaml @@ -1,6 +1,6 @@ {{- include "fission-role-generator" (merge (dict "namespace" .Values.defaultNamespace "component" "timer") .) }} -{{- if not .Values.singleDefaultNamespace }} +{{- if gt (len .Values.additionalFissionNamespaces) 0 }} {{- range $namespace := $.Values.additionalFissionNamespaces }} {{ include "fission-role-generator" (merge (dict "namespace" $namespace "component" "timer") $) }} {{- end }} diff --git a/charts/fission-all/templates/timer/role-kubernetes.yaml b/charts/fission-all/templates/timer/role-kubernetes.yaml index 1eae3d29..d7aff451 100644 --- a/charts/fission-all/templates/timer/role-kubernetes.yaml +++ b/charts/fission-all/templates/timer/role-kubernetes.yaml @@ -1,6 +1,6 @@ {{- include "kubernetes-role-generator" (merge (dict "namespace" .Values.defaultNamespace "component" "timer") .) }} -{{- if not .Values.singleDefaultNamespace }} +{{- if gt (len .Values.additionalFissionNamespaces) 0 }} {{- range $namespace := $.Values.additionalFissionNamespaces }} {{ include "kubernetes-role-generator" (merge (dict "namespace" $namespace "component" "timer") $) }} {{- end }} diff --git a/charts/fission-all/values.yaml b/charts/fission-all/values.yaml index d51039c5..bf892097 100644 --- a/charts/fission-all/values.yaml +++ b/charts/fission-all/values.yaml @@ -65,7 +65,6 @@ routerPort: 31314 ## This is different from the release namespace. ## Please consider setting `singleDefaultNamespace` and `additionalFissionNamespaces` if you want ## more than one namespace to be used for Fission custom resources. -## Fission will watch the defaultNamespace only if `singleDefaultNamespace` is true. ## defaultNamespace: default @@ -81,12 +80,7 @@ builderNamespace: "" ## functionNamespace: "" -## If true, fission will only watch for fission custom resources created in the `defaultNamespace` above. -## -singleDefaultNamespace: true - ## Fission will watch the following namespaces along with the `defaultNamespace` for fission custom resources. -## Only works if `singleDefaultNamespace` is false. ## additionalFissionNamespaces: ## - namespace1 ## - namespace2 diff --git a/pkg/utils/serviceaccount.go b/pkg/utils/serviceaccount.go index 09d14d68..98314994 100644 --- a/pkg/utils/serviceaccount.go +++ b/pkg/utils/serviceaccount.go @@ -52,7 +52,7 @@ var ( permissions: []*PermissionCheck{ { gvr: &schema.GroupVersionResource{Group: "", Version: "v1", Resource: "pods"}, - verb: "list", + verb: "get", }, { gvr: &schema.GroupVersionResource{Group: "", Version: "v1", Resource: "configmaps"},