feat: add namespaceOverride option

charts/fluent-bit-aggregator/templates/_helpers.tpl

@@ -23,6 +23,17 @@ If release name contains chart name it will be used as a full name.
 {{- end }}
 {{- end }}
 
+{{/*
+Allow the release namespace to be overridden for multi-namespace deployments in combined charts
+*/}}
+{{- define "fluent-bit-aggregator.namespace" -}}
+{{- if .Values.namespaceOverride -}}
+{{- .Values.namespaceOverride -}}
+{{- else -}}
+{{- .Release.Namespace -}}
+{{- end -}}
+{{- end -}}
+
 {{/*
 Create chart name and version as used by the chart label.
 */}}

charts/fluent-bit-aggregator/templates/clusterrole.yaml

@@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   name: {{ include "fluent-bit-aggregator.fullname" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "fluent-bit-aggregator.namespace" . }}
   labels:
     {{- include "fluent-bit-aggregator.labels" . | nindent 4 }}
 rules:

charts/fluent-bit-aggregator/templates/clusterrolebinding.yaml

@@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   name: {{ include "fluent-bit-aggregator.fullname" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "fluent-bit-aggregator.namespace" . }}
   labels:
     {{- include "fluent-bit-aggregator.labels" . | nindent 4 }}
 roleRef:
@@ -13,5 +13,5 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: {{ include "fluent-bit-aggregator.serviceAccountName" . }}
-    namespace: {{ .Release.Namespace }}
+    namespace: {{ include "fluent-bit-aggregator.namespace" . }}
 {{- end }}

charts/fluent-bit-aggregator/templates/configmap-config.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ include "fluent-bit-aggregator.configConfigMapName" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "fluent-bit-aggregator.namespace" . }}
   labels:
     {{- include "fluent-bit-aggregator.labels" . | nindent 4 }}
 data:

charts/fluent-bit-aggregator/templates/configmap-dashboard.yaml

@@ -4,7 +4,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ include "fluent-bit-aggregator.dashboardConfigMapName" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "fluent-bit-aggregator.namespace" . }}
   labels:
     {{- include "fluent-bit-aggregator.labels" . | nindent 4 }}
     grafana_dashboard: "1"

charts/fluent-bit-aggregator/templates/configmap-scripts.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ include "fluent-bit-aggregator.scriptsConfigMapName" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "fluent-bit-aggregator.namespace" . }}
   labels:
     {{- include "fluent-bit-aggregator.labels" . | nindent 4 }}
 data:

charts/fluent-bit-aggregator/templates/hpa.yaml

@@ -3,7 +3,7 @@ apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "fluent-bit-aggregator.fullname" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "fluent-bit-aggregator.namespace" . }}
   labels:
     {{- include "fluent-bit-aggregator.labels" . | nindent 4 }}
 spec:

charts/fluent-bit-aggregator/templates/ingress.yaml

@@ -5,7 +5,7 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ (printf "%s-%s" ((include "fluent-bit-aggregator.fullname" $) | trunc 60) (toString $i)) | trunc 63 | trimSuffix "-" }}
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ include "fluent-bit-aggregator.namespace" $ }}
   labels:
     {{- include "fluent-bit-aggregator.labels" $ | nindent 4 }}
   {{- with $v.annotations }}

charts/fluent-bit-aggregator/templates/pdb.yaml

@@ -3,7 +3,7 @@ apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
   name: {{ include "fluent-bit-aggregator.fullname" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "fluent-bit-aggregator.namespace" . }}
   labels:
     {{- include "fluent-bit-aggregator.labels" . | nindent 4 }}
 spec:

charts/fluent-bit-aggregator/templates/service-headless.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "fluent-bit-aggregator.headlessServiceName" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "fluent-bit-aggregator.namespace" . }}
   labels:
     {{- include "fluent-bit-aggregator.labels" . | nindent 4 }}
     prometheus.io/service-monitor: "false"

charts/fluent-bit-aggregator/templates/service.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "fluent-bit-aggregator.serviceName" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "fluent-bit-aggregator.namespace" . }}
   labels:
     {{- include "fluent-bit-aggregator.labels" . | nindent 4 }}
   {{- with .Values.service.annotations }}

charts/fluent-bit-aggregator/templates/serviceaccount.yaml

@@ -3,7 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ include "fluent-bit-aggregator.serviceAccountName" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "fluent-bit-aggregator.namespace" . }}
   labels:
     {{- include "fluent-bit-aggregator.labels" . | nindent 4 }}
   {{- with .Values.serviceAccount.labels }}

charts/fluent-bit-aggregator/templates/servicemonitor.yaml

@@ -3,7 +3,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: {{ include "fluent-bit-aggregator.fullname" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "fluent-bit-aggregator.namespace" . }}
   labels:
     {{- include "fluent-bit-aggregator.labels" . | nindent 4 }}
   {{- with .Values.serviceMonitor.additionalLabels }}
@@ -13,7 +13,7 @@ spec:
   jobLabel: app.kubernetes.io/instance
   namespaceSelector:
     matchNames:
-      - {{ .Release.Namespace }}
+      - {{ include "fluent-bit-aggregator.namespace" . }}
   selector:
     matchLabels:
       {{- include "fluent-bit-aggregator.selectorLabels" . | nindent 6 }}

charts/fluent-bit-aggregator/templates/statefulset.yaml

@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: {{ include "fluent-bit-aggregator.fullname" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "fluent-bit-aggregator.namespace" . }}
   labels:
     {{- include "fluent-bit-aggregator.labels" . | nindent 4 }}
 spec:

charts/fluent-bit-aggregator/values.yaml

@@ -21,6 +21,9 @@ nameOverride:
 # -- (string) Override the full name of the chart.
 fullnameOverride:
 
+# -- (string) Override the namespace of the chart.
+namespaceOverride:
+
 # -- Labels to add to all chart resources.
 commonLabels: {}
 

charts/fluent-bit-collector/templates/_helpers.tpl

@@ -23,6 +23,17 @@ If release name contains chart name it will be used as a full name.
 {{- end }}
 {{- end }}
 
+{{/*
+Allow the release namespace to be overridden for multi-namespace deployments in combined charts
+*/}}
+{{- define "fluent-bit-collector.namespace" -}}
+{{- if .Values.namespaceOverride -}}
+{{- .Values.namespaceOverride -}}
+{{- else -}}
+{{- .Release.Namespace -}}
+{{- end -}}
+{{- end -}}
+
 {{/*
 Create chart name and version as used by the chart label.
 */}}

charts/fluent-bit-collector/templates/clusterrole.yaml

@@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   name: {{ include "fluent-bit-collector.fullname" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "fluent-bit-collector.namespace" . }}
   labels:
     {{- include "fluent-bit-collector.labels" . | nindent 4 }}
 rules:

charts/fluent-bit-collector/templates/clusterrolebinding.yaml

@@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   name: {{ include "fluent-bit-collector.fullname" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "fluent-bit-collector.namespace" . }}
   labels:
     {{- include "fluent-bit-collector.labels" . | nindent 4 }}
 roleRef:
@@ -13,5 +13,5 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: {{ include "fluent-bit-collector.serviceAccountName" . }}
-    namespace: {{ .Release.Namespace }}
+    namespace: {{ include "fluent-bit-collector.namespace" . }}
 {{- end }}

charts/fluent-bit-collector/templates/configmap-config.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ include "fluent-bit-collector.configConfigMapName" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "fluent-bit-collector.namespace" . }}
   labels:
     {{- include "fluent-bit-collector.labels" . | nindent 4 }}
 data:

charts/fluent-bit-collector/templates/configmap-dashboard.yaml

@@ -4,7 +4,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ include "fluent-bit-collector.dashboardConfigMapName" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "fluent-bit-collector.namespace" . }}
   labels:
     {{- include "fluent-bit-collector.labels" . | nindent 4 }}
     grafana_dashboard: "1"

charts/fluent-bit-collector/templates/configmap-scripts.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ include "fluent-bit-collector.scriptsConfigMapName" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "fluent-bit-collector.namespace" . }}
   labels:
     {{- include "fluent-bit-collector.labels" . | nindent 4 }}
 data:

charts/fluent-bit-collector/templates/daemonset.yaml

@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: {{ include "fluent-bit-collector.fullname" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "fluent-bit-collector.namespace" . }}
   labels:
     {{- include "fluent-bit-collector.labels" . | nindent 4 }}
 spec:

charts/fluent-bit-collector/templates/podmonitor.yaml

@@ -3,7 +3,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: PodMonitor
 metadata:
   name: {{ include "fluent-bit-collector.fullname" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "fluent-bit-collector.namespace" . }}
   labels:
     {{- include "fluent-bit-collector.labels" . | nindent 4 }}
   {{- with .Values.serviceMonitor.additionalLabels }}
@@ -13,7 +13,7 @@ spec:
   jobLabel: app.kubernetes.io/instance
   namespaceSelector:
     matchNames:
-      - {{ .Release.Namespace }}
+      - {{ include "fluent-bit-collector.namespace" . }}
   selector:
     matchLabels:
       {{- include "fluent-bit-collector.selectorLabels" . | nindent 6 }}

charts/fluent-bit-collector/templates/service.yaml

@@ -3,7 +3,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "fluent-bit-collector.serviceName" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "fluent-bit-collector.namespace" . }}
   labels:
     {{- include "fluent-bit-collector.labels" . | nindent 4 }}
   {{- with .Values.service.annotations }}

charts/fluent-bit-collector/templates/serviceaccount.yaml

@@ -3,7 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ include "fluent-bit-collector.serviceAccountName" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "fluent-bit-collector.namespace" . }}
   labels:
     {{- include "fluent-bit-collector.labels" . | nindent 4 }}
   {{- with .Values.serviceAccount.labels }}

charts/fluent-bit-collector/templates/servicemonitor.yaml

@@ -3,7 +3,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: {{ include "fluent-bit-collector.fullname" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "fluent-bit-collector.namespace" . }}
   labels:
     {{- include "fluent-bit-collector.labels" . | nindent 4 }}
   {{- with .Values.serviceMonitor.additionalLabels }}
@@ -13,7 +13,7 @@ spec:
   jobLabel: app.kubernetes.io/instance
   namespaceSelector:
     matchNames:
-      - {{ .Release.Namespace }}
+      - {{ include "fluent-bit-collector.namespace" . }}
   selector:
     matchLabels:
       {{- include "fluent-bit-collector.selectorLabels" . | nindent 6 }}

charts/fluent-bit-collector/values.yaml

@@ -21,6 +21,9 @@ nameOverride:
 # -- (string) Override the full name of the chart.
 fullnameOverride:
 
+# -- (string) Override the namespace of the chart.
+namespaceOverride:
+
 # -- Labels to add to all chart resources.
 commonLabels: {}
 

charts/fluent-bit/templates/NOTES.txt

@@ -1,6 +1,6 @@
 Get Fluent Bit build information by running these commands:
 
-export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "fluent-bit.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
-kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 2020:2020
+export POD_NAME=$(kubectl get pods --namespace {{ include "fluent-bit.namespace" . }} -l "app.kubernetes.io/name={{ include "fluent-bit.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+kubectl --namespace {{ include "fluent-bit.namespace" . }} port-forward $POD_NAME 2020:2020
 curl http://127.0.0.1:2020 
 

charts/fluent-bit/templates/_helpers.tpl

@@ -24,6 +24,17 @@ If release name contains chart name it will be used as a full name.
 {{- end -}}
 {{- end -}}
 
+{{/*
+Allow the release namespace to be overridden for multi-namespace deployments in combined charts
+*/}}
+{{- define "fluent-bit.namespace" -}}
+{{- if .Values.namespaceOverride -}}
+{{- .Values.namespaceOverride -}}
+{{- else -}}
+{{- .Release.Namespace -}}
+{{- end -}}
+{{- end -}}
+
 {{/*
 Create chart name and version as used by the chart label.
 */}}

charts/fluent-bit/templates/clusterrolebinding.yaml

@@ -12,5 +12,5 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: {{ include "fluent-bit.serviceAccountName" . }}
-    namespace: {{ .Release.Namespace }}
+    namespace: {{ include "fluent-bit.namespace" . }}
 {{- end -}}

charts/fluent-bit/templates/configmap-dashboards.yaml

@@ -5,7 +5,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ include "fluent-bit.fullname" $ }}-dashboard-{{ trimSuffix ".json" (base $path) }}
-  namespace: {{ default $.Release.Namespace $.Values.dashboards.namespace }}
+  namespace: {{ default (include "fluent-bit.namespace" $) $.Values.dashboards.namespace }}
   {{- with $.Values.dashboards.annotations }}
   annotations:
     {{- toYaml . | nindent 4 -}}

charts/fluent-bit/templates/configmap-luascripts.yaml

@@ -3,7 +3,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ include "fluent-bit.fullname" . }}-luascripts
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "fluent-bit.namespace" . }}
   labels:
     {{- include "fluent-bit.labels" . | nindent 4 }}
 data:

charts/fluent-bit/templates/configmap.yaml

@@ -3,7 +3,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ include "fluent-bit.fullname" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "fluent-bit.namespace" . }}
   labels:
     {{- include "fluent-bit.labels" . | nindent 4 }}
 data:

charts/fluent-bit/templates/daemonset.yaml

@@ -3,7 +3,7 @@ apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: {{ include "fluent-bit.fullname" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "fluent-bit.namespace" . }}
   labels:
     {{- include "fluent-bit.labels" . | nindent 4 }}
     {{- with .Values.labels }}

charts/fluent-bit/templates/deployment.yaml

@@ -3,7 +3,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "fluent-bit.fullname" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "fluent-bit.namespace" . }}
   labels:
     {{- include "fluent-bit.labels" . | nindent 4 }}
     {{- with .Values.labels }}

charts/fluent-bit/templates/hpa.yaml

@@ -3,7 +3,7 @@ apiVersion: {{ include "fluent-bit.hpa.apiVersion" . }}
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "fluent-bit.fullname" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "fluent-bit.namespace" . }}
   labels:
     {{- include "fluent-bit.labels" . | nindent 4 }}
 spec: