Use .Release.Namespace to render namespace for the fluent-bit resourc…

…es (#368) define namespace for the k8s resources Signed-off-by: Praveen <[email protected]> update test namespace Signed-off-by: Praveen <[email protected]> use .Release.Namespace Signed-off-by: Praveen <[email protected]> revert to using existing custom namespace for servicemonitor Signed-off-by: Praveen <[email protected]> update test to use .Release.Namespace Signed-off-by: Praveen <[email protected]> use default namespace if not overwritten using custom values Signed-off-by: Praveen <[email protected]> add empty value for testFramework.namespace Signed-off-by: Praveen <[email protected]> Update charts/fluent-bit/values.yaml Co-authored-by: Steve Hipwell <[email protected]> Signed-off-by: Praveen <[email protected]> Update charts/fluent-bit/templates/servicemonitor.yaml Co-authored-by: Steve Hipwell <[email protected]> Signed-off-by: Praveen <[email protected]> remove namespace from cluster resources Signed-off-by: Praveen <[email protected]> bump version update changelog
fluent · May 31, 2023 · 372b02e · 372b02e
1 parent 300c043
commit 372b02e
Show file tree

Hide file tree

Showing 17 changed files with 18 additions and 11 deletions.
diff --git a/charts/fluent-bit/Chart.yaml b/charts/fluent-bit/Chart.yaml
@@ -5,7 +5,7 @@ keywords:
   - logging
   - fluent-bit
   - fluentd
-version: 0.30.2
+version: 0.30.3
 appVersion: 2.1.4
 icon: https://raw.githubusercontent.com/cncf/artwork/master/projects/fluentd/fluentbit/icon/fluentbit-icon-color.svg
 home: https://fluentbit.io/
@@ -23,4 +23,4 @@ maintainers:
 annotations:
   artifacthub.io/changes: |
     - kind: added
-      description: "Added image reference by digest."
+      description: "Use .Release.Namespace to render namespace for the fluent-bit resources."
diff --git a/charts/fluent-bit/templates/configmap-dashboards.yaml b/charts/fluent-bit/templates/configmap-dashboards.yaml
@@ -5,9 +5,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ include "fluent-bit.fullname" $ }}-dashboard-{{ trimSuffix ".json" (base $path) }}
-  {{- with $.Values.dashboards.namespace }}
-  namespace: {{ . }}
-  {{- end }}
+  namespace: {{ default $.Release.Namespace $.Values.dashboards.namespace }}
   {{- with $.Values.dashboards.annotations }}
   annotations:
     {{- toYaml . | nindent 4 -}}

diff --git a/charts/fluent-bit/templates/configmap-luascripts.yaml b/charts/fluent-bit/templates/configmap-luascripts.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ include "fluent-bit.fullname" . }}-luascripts
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "fluent-bit.labels" . | nindent 4 }}
 data:

diff --git a/charts/fluent-bit/templates/configmap.yaml b/charts/fluent-bit/templates/configmap.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ include "fluent-bit.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "fluent-bit.labels" . | nindent 4 }}
 data:

diff --git a/charts/fluent-bit/templates/daemonset.yaml b/charts/fluent-bit/templates/daemonset.yaml
@@ -3,6 +3,7 @@ apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: {{ include "fluent-bit.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "fluent-bit.labels" . | nindent 4 }}
     {{- with .Values.labels }}

diff --git a/charts/fluent-bit/templates/deployment.yaml b/charts/fluent-bit/templates/deployment.yaml
@@ -3,6 +3,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "fluent-bit.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "fluent-bit.labels" . | nindent 4 }}
     {{- with .Values.labels }}

diff --git a/charts/fluent-bit/templates/hpa.yaml b/charts/fluent-bit/templates/hpa.yaml
@@ -3,6 +3,7 @@ apiVersion: {{ include "fluent-bit.hpa.apiVersion" . }}
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "fluent-bit.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "fluent-bit.labels" . | nindent 4 }}
 spec:

diff --git a/charts/fluent-bit/templates/ingress.yaml b/charts/fluent-bit/templates/ingress.yaml
@@ -9,6 +9,7 @@ apiVersion: {{ include "fluent-bit.ingress.apiVersion" . }}
 kind: Ingress
 metadata:
   name: {{ $fullName }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "fluent-bit.labels" . | nindent 4 }}
   {{- with .Values.ingress.annotations }}

diff --git a/charts/fluent-bit/templates/networkpolicy.yaml b/charts/fluent-bit/templates/networkpolicy.yaml
@@ -3,6 +3,7 @@ apiVersion: "networking.k8s.io/v1"
 kind: "NetworkPolicy"
 metadata:
   name: {{ include "fluent-bit.fullname" . | quote }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "fluent-bit.labels" . | nindent 4 }}
 spec:

diff --git a/charts/fluent-bit/templates/pdb.yaml b/charts/fluent-bit/templates/pdb.yaml
@@ -3,6 +3,7 @@ apiVersion: {{ include "fluent-bit.pdb.apiVersion" . }}
 kind: PodDisruptionBudget
 metadata:
   name: {{ include "fluent-bit.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "fluent-bit.labels" . | nindent 4 }}
 {{- with .Values.podDisruptionBudget.annotations }}

diff --git a/charts/fluent-bit/templates/prometheusrule.yaml b/charts/fluent-bit/templates/prometheusrule.yaml
@@ -3,9 +3,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
   name: {{ include "fluent-bit.fullname" . }}
-  {{- with .Values.prometheusRule.namespace }}
-  namespace: {{ . }}
-  {{- end }}
+  namespace: {{ default $.Release.Namespace .Values.prometheusRule.namespace }}
   labels:
     {{- include "fluent-bit.labels" . | nindent 4 }}
   {{- if .Values.prometheusRule.additionalLabels }}

diff --git a/charts/fluent-bit/templates/service.yaml b/charts/fluent-bit/templates/service.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "fluent-bit.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "fluent-bit.labels" . | nindent 4 }}
     {{- with .Values.service.labels }}

diff --git a/charts/fluent-bit/templates/serviceaccount.yaml b/charts/fluent-bit/templates/serviceaccount.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ include "fluent-bit.serviceAccountName" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "fluent-bit.labels" . | nindent 4 }}
   {{- with .Values.serviceAccount.annotations }}

diff --git a/charts/fluent-bit/templates/servicemonitor.yaml b/charts/fluent-bit/templates/servicemonitor.yaml
@@ -3,9 +3,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: {{ template "fluent-bit.fullname" . }}
-  {{- with .Values.serviceMonitor.namespace }}
-  namespace: {{ . }}
-  {{- end }}
+  namespace: {{ default .Release.Namespace .Values.serviceMonitor.namespace }}
   labels:
     {{- include "fluent-bit.labels" . | nindent 4 }}
     {{- with .Values.serviceMonitor.selector }}

diff --git a/charts/fluent-bit/templates/tests/test-connection.yaml b/charts/fluent-bit/templates/tests/test-connection.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: Pod
 metadata:
   name: "{{ include "fluent-bit.fullname" . }}-test-connection"
+  namespace: {{ default .Release.Namespace .Values.testFramework.namespace }}
   labels:
     {{- include "fluent-bit.labels" . | nindent 4 }}
   annotations:

diff --git a/charts/fluent-bit/templates/vpa.yaml b/charts/fluent-bit/templates/vpa.yaml
@@ -3,6 +3,7 @@ apiVersion: autoscaling.k8s.io/v1
 kind: VerticalPodAutoscaler
 metadata:
   name: {{ include "fluent-bit.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "fluent-bit.labels" . | nindent 4 }}
   {{- with .Values.autoscaling.vpa.annotations }}

diff --git a/charts/fluent-bit/values.yaml b/charts/fluent-bit/values.yaml
@@ -15,6 +15,7 @@ image:
 
 testFramework:
   enabled: true
+  namespace:
   image:
     repository: busybox
     pullPolicy: Always