fix(helm): ensure helm resources have correct namespace

grafana · Nov 5, 2024 · 1dce934 · 1dce934
1 parent 23fc404
commit 1dce934
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 3 deletions.
diff --git a/operations/helm/charts/alloy/CHANGELOG.md b/operations/helm/charts/alloy/CHANGELOG.md
@@ -9,9 +9,15 @@ internal API changes are not present.
 
 Unreleased
 ----------
+
 ### Enhancements
+
 - Add support for adding hostAliases to the Helm chart. (@duncan485)
 
+### Bug Fixes
+
+- Set resource namespace correctly (@shinebayar-g)
+
 0.9.2 (2024-10-18)
 ------------------
 
@@ -67,7 +73,6 @@ Unreleased
 
 - Update helm chart to use v1.3.1.
 
-
 0.6.0 (2024-08-05)
 ------------------
 
@@ -119,7 +124,6 @@ Unreleased
 
 - Update to Grafana Alloy v1.1.0. (@rfratto)
 
-
 0.2.0 (2024-05-08)
 ------------------
 

diff --git a/operations/helm/charts/alloy/templates/cluster_service.yaml b/operations/helm/charts/alloy/templates/cluster_service.yaml
@@ -4,6 +4,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "alloy.fullname" . }}-cluster
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "alloy.labels" . | nindent 4 }}
     app.kubernetes.io/component: networking

diff --git a/operations/helm/charts/alloy/templates/configmap.yaml b/operations/helm/charts/alloy/templates/configmap.yaml
@@ -4,6 +4,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ include "alloy.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "alloy.labels" . | nindent 4 }}
     app.kubernetes.io/component: config

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

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

diff --git a/operations/helm/charts/alloy/templates/controllers/statefulset.yaml b/operations/helm/charts/alloy/templates/controllers/statefulset.yaml
@@ -6,6 +6,7 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: {{ include "alloy.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "alloy.labels" . | nindent 4 }}
   {{- with .Values.controller.extraAnnotations }}

diff --git a/operations/helm/charts/alloy/templates/hpa.yaml b/operations/helm/charts/alloy/templates/hpa.yaml
@@ -16,6 +16,7 @@ apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "alloy.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "alloy.labels" . | nindent 4 }}
     app.kubernetes.io/component: availability

diff --git a/operations/helm/charts/alloy/templates/ingress.yaml b/operations/helm/charts/alloy/templates/ingress.yaml
@@ -11,7 +11,7 @@ apiVersion: {{ include "alloy.ingress.apiVersion" . }}
 kind: Ingress
 metadata:
   name: {{ $fullName }}
-  namespace: {{ include "alloy.namespace" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "alloy.labels" . | nindent 4 }}
     app.kubernetes.io/component: networking

diff --git a/operations/helm/charts/alloy/templates/service.yaml b/operations/helm/charts/alloy/templates/service.yaml
@@ -4,6 +4,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "alloy.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "alloy.labels" . | nindent 4 }}
     app.kubernetes.io/component: networking

diff --git a/operations/helm/charts/alloy/templates/servicemonitor.yaml b/operations/helm/charts/alloy/templates/servicemonitor.yaml
@@ -4,6 +4,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: {{ include "alloy.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "alloy.labels" . | nindent 4 }}
     app.kubernetes.io/component: metrics