feat(helm): Respect helm release namespace setting

Whenever a helm chart is rendered you can pass it a namespace. Usually a chart then adds the namespace to the namespaced resources it is rendering. This change establishes that behaviour in the fluent-operator chart. Signed-off-by: Zoltán Reegn <[email protected]>
fluent · Jun 20, 2024 · 737e804 · 737e804
1 parent 1d594d7
commit 737e804
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 2 deletions.
diff --git a/charts/fluent-operator/templates/fluent-operator-deployment.yaml b/charts/fluent-operator/templates/fluent-operator-deployment.yaml
@@ -2,6 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: fluent-operator
+  namespace: {{ .Release.Namespace | quote }}
   labels:
     app.kubernetes.io/component: operator
     app.kubernetes.io/name: fluent-operator

diff --git a/charts/fluent-operator/templates/fluentbit-containerd-config.yaml b/charts/fluent-operator/templates/fluentbit-containerd-config.yaml
@@ -5,6 +5,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: fluent-bit-containerd-config
+  namespace: {{ .Release.Namespace | quote }}
 data:
   containerd.lua: |
     function containerd( tag, timestamp, record)

diff --git a/charts/fluent-operator/templates/fluentbit-fluentBit.yaml b/charts/fluent-operator/templates/fluentbit-fluentBit.yaml
@@ -4,6 +4,7 @@ apiVersion: fluentbit.fluent.io/v1alpha2
 kind: FluentBit
 metadata:
   name: fluent-bit
+  namespace: {{ .Release.Namespace | quote }}
   labels:
     app.kubernetes.io/name: fluent-bit
 spec:

diff --git a/charts/fluent-operator/templates/fluentbit-fluentbit-edge.yaml b/charts/fluent-operator/templates/fluentbit-fluentbit-edge.yaml
@@ -3,7 +3,7 @@ apiVersion: fluentbit.fluent.io/v1alpha2
 kind: FluentBit
 metadata:
   name: fluentbit-edge
-  namespace: fluent
+  namespace: {{ .Release.Namespace | quote }}
   labels:
     app.kubernetes.io/name: fluent-bit
 spec:
@@ -40,4 +40,4 @@ spec:
       mountPropagation: HostToContainer
       name: host-proc
       readOnly: true
-{{- end }}
+{{- end }}
diff --git a/charts/fluent-operator/templates/fluentbit-lua-config.yaml b/charts/fluent-operator/templates/fluentbit-lua-config.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: fluent-bit-lua
+  namespace: {{ .Release.Namespace | quote }}
 data:
   systemd.lua: |
     function add_time(tag, timestamp, record)

diff --git a/charts/fluent-operator/templates/fluentbit-output-loki.yaml b/charts/fluent-operator/templates/fluentbit-output-loki.yaml
@@ -19,6 +19,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ $k |quote }}
+  namespace: {{ .Release.Namespace | quote }}
 type: Opaque
 data:
   value: {{ $v | b64enc | quote }}

diff --git a/charts/fluent-operator/templates/fluentd-fluentd.yaml b/charts/fluent-operator/templates/fluentd-fluentd.yaml
@@ -4,6 +4,7 @@ apiVersion: fluentd.fluent.io/v1alpha1
 kind: Fluentd
 metadata:
   name: {{ .Values.fluentd.name }}
+  namespace: {{ .Release.Namespace | quote }}
   labels:
     app.kubernetes.io/name: fluentd
 spec: