fix(helm): ensure helm resources have correct namespace

operations/helm/charts/alloy/CHANGELOG.md

@@ -10,8 +10,13 @@ internal API changes are not present.
 Unreleased
 ----------
 
+### Bug Fixes
+
+- Set resource namespace correctly (@shinebayar-g)
+
 0.10.0 (2024-11-13)
 ----------
+
 ### Enhancements
 
 - Add support for adding hostAliases to the Helm chart. (@duncan485)
@@ -72,7 +77,6 @@ Unreleased
 
 - Update helm chart to use v1.3.1.
 
-
 0.6.0 (2024-08-05)
 ------------------
 
@@ -124,7 +128,6 @@ Unreleased
 
 - Update to Grafana Alloy v1.1.0. (@rfratto)
 
-
 0.2.0 (2024-05-08)
 ------------------
 

operations/helm/charts/alloy/README.md

@@ -123,6 +123,7 @@ useful if just using the default DaemonSet isn't sufficient.
 | ingress.pathType | string | `"Prefix"` |  |
 | ingress.tls | list | `[]` |  |
 | nameOverride | string | `nil` | Overrides the chart's name. Used to change the infix in the resource names. |
+| namespaceOverride | string | `nil` | Overrides the chart's namespace. |
 | rbac.create | bool | `true` | Whether to create RBAC resources for Alloy. |
 | service.annotations | object | `{}` |  |
 | service.clusterIP | string | `""` | Cluster IP, can be set to None, empty "" or an IP address |

operations/helm/charts/alloy/templates/cluster_service.yaml

@@ -4,6 +4,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "alloy.fullname" . }}-cluster
+  namespace: {{ include "alloy.namespace" . }}
   labels:
     {{- include "alloy.labels" . | nindent 4 }}
     app.kubernetes.io/component: networking

operations/helm/charts/alloy/templates/configmap.yaml

@@ -4,6 +4,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ include "alloy.fullname" . }}
+  namespace: {{ include "alloy.namespace" . }}
   labels:
     {{- include "alloy.labels" . | nindent 4 }}
     app.kubernetes.io/component: config

operations/helm/charts/alloy/templates/controllers/daemonset.yaml

@@ -3,6 +3,7 @@ apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: {{ include "alloy.fullname" . }}
+  namespace: {{ include "alloy.namespace" . }}
   labels:
     {{- include "alloy.labels" . | nindent 4 }}
   {{- with .Values.controller.extraAnnotations }}

operations/helm/charts/alloy/templates/controllers/deployment.yaml

@@ -3,6 +3,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "alloy.fullname" . }}
+  namespace: {{ include "alloy.namespace" . }}
   labels:
     {{- include "alloy.labels" . | nindent 4 }}
   {{- with .Values.controller.extraAnnotations }}

operations/helm/charts/alloy/templates/controllers/statefulset.yaml

@@ -6,6 +6,7 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: {{ include "alloy.fullname" . }}
+  namespace: {{ include "alloy.namespace" . }}
   labels:
     {{- include "alloy.labels" . | nindent 4 }}
   {{- with .Values.controller.extraAnnotations }}

operations/helm/charts/alloy/templates/hpa.yaml

@@ -16,6 +16,7 @@ apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "alloy.fullname" . }}
+  namespace: {{ include "alloy.namespace" . }}
   labels:
     {{- include "alloy.labels" . | nindent 4 }}
     app.kubernetes.io/component: availability

operations/helm/charts/alloy/templates/pdb.yaml

@@ -15,7 +15,7 @@ apiVersion: {{ include "alloy.controller.pdb.apiVersion" . }}
 kind: PodDisruptionBudget
 metadata:
   name: {{ include "alloy.fullname" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "alloy.namespace" . }}
   labels:
     {{- include "alloy.labels" . | nindent 4 }}
 spec:
@@ -28,4 +28,4 @@ spec:
   {{- if .Values.controller.podDisruptionBudget.maxUnavailable }}
   maxUnavailable: {{ .Values.controller.podDisruptionBudget.maxUnavailable }}
   {{- end }}
-{{- end }}
+{{- end }}

operations/helm/charts/alloy/templates/rbac.yaml

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

operations/helm/charts/alloy/templates/service.yaml

@@ -4,6 +4,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "alloy.fullname" . }}
+  namespace: {{ include "alloy.namespace" . }}
   labels:
     {{- include "alloy.labels" . | nindent 4 }}
     app.kubernetes.io/component: networking

operations/helm/charts/alloy/templates/serviceaccount.yaml

@@ -3,7 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ include "alloy.serviceAccountName" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "alloy.namespace" . }}
   labels:
     {{- include "alloy.labels" . | nindent 4 }}
     app.kubernetes.io/component: rbac

operations/helm/charts/alloy/templates/servicemonitor.yaml

@@ -4,6 +4,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: {{ include "alloy.fullname" . }}
+  namespace: {{ include "alloy.namespace" . }}
   labels:
     {{- include "alloy.labels" . | nindent 4 }}
     app.kubernetes.io/component: metrics

operations/helm/charts/alloy/values.yaml

@@ -1,6 +1,9 @@
 # -- Overrides the chart's name. Used to change the infix in the resource names.
 nameOverride: null
 
+# -- Overrides the chart's namespace.
+namespaceOverride: null
+
 # -- Overrides the chart's computed fullname. Used to change the full prefix of
 # resource names.
 fullnameOverride: null

operations/helm/tests/additional-serviceaccount-label/alloy/templates/configmap.yaml

@@ -4,6 +4,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: alloy
+  namespace: default
   labels:
     helm.sh/chart: alloy
     app.kubernetes.io/name: alloy

operations/helm/tests/additional-serviceaccount-label/alloy/templates/controllers/daemonset.yaml

@@ -4,6 +4,7 @@ apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: alloy
+  namespace: default
   labels:
     helm.sh/chart: alloy
     app.kubernetes.io/name: alloy

operations/helm/tests/additional-serviceaccount-label/alloy/templates/service.yaml

@@ -4,6 +4,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: alloy
+  namespace: default
   labels:
     helm.sh/chart: alloy
     app.kubernetes.io/name: alloy

operations/helm/tests/clustering/alloy/templates/cluster_service.yaml

@@ -4,6 +4,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: alloy-cluster
+  namespace: default
   labels:
     helm.sh/chart: alloy
     app.kubernetes.io/name: alloy

operations/helm/tests/clustering/alloy/templates/configmap.yaml

@@ -4,6 +4,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: alloy
+  namespace: default
   labels:
     helm.sh/chart: alloy
     app.kubernetes.io/name: alloy

operations/helm/tests/clustering/alloy/templates/controllers/statefulset.yaml

@@ -4,6 +4,7 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: alloy
+  namespace: default
   labels:
     helm.sh/chart: alloy
     app.kubernetes.io/name: alloy

operations/helm/tests/clustering/alloy/templates/service.yaml

@@ -4,6 +4,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: alloy
+  namespace: default
   labels:
     helm.sh/chart: alloy
     app.kubernetes.io/name: alloy

operations/helm/tests/controller-deployment-pdb-max-unavailable/alloy/templates/configmap.yaml

@@ -4,6 +4,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: alloy
+  namespace: default
   labels:
     helm.sh/chart: alloy
     app.kubernetes.io/name: alloy

operations/helm/tests/controller-deployment-pdb-max-unavailable/alloy/templates/controllers/deployment.yaml

@@ -4,6 +4,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: alloy
+  namespace: default
   labels:
     helm.sh/chart: alloy
     app.kubernetes.io/name: alloy

operations/helm/tests/controller-deployment-pdb-max-unavailable/alloy/templates/service.yaml

@@ -4,6 +4,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: alloy
+  namespace: default
   labels:
     helm.sh/chart: alloy
     app.kubernetes.io/name: alloy

operations/helm/tests/controller-deployment-pdb-min-available/alloy/templates/configmap.yaml

@@ -4,6 +4,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: alloy
+  namespace: default
   labels:
     helm.sh/chart: alloy
     app.kubernetes.io/name: alloy

operations/helm/tests/controller-deployment-pdb-min-available/alloy/templates/controllers/deployment.yaml

@@ -4,6 +4,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: alloy
+  namespace: default
   labels:
     helm.sh/chart: alloy
     app.kubernetes.io/name: alloy

operations/helm/tests/controller-deployment-pdb-min-available/alloy/templates/service.yaml

@@ -4,6 +4,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: alloy
+  namespace: default
   labels:
     helm.sh/chart: alloy
     app.kubernetes.io/name: alloy

operations/helm/tests/controller-statefulset-pdb-max-unavailable/alloy/templates/configmap.yaml

@@ -4,6 +4,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: alloy
+  namespace: default
   labels:
     helm.sh/chart: alloy
     app.kubernetes.io/name: alloy

operations/helm/tests/controller-statefulset-pdb-max-unavailable/alloy/templates/controllers/statefulset.yaml

@@ -4,6 +4,7 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: alloy
+  namespace: default
   labels:
     helm.sh/chart: alloy
     app.kubernetes.io/name: alloy

operations/helm/tests/controller-statefulset-pdb-max-unavailable/alloy/templates/service.yaml

@@ -4,6 +4,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: alloy
+  namespace: default
   labels:
     helm.sh/chart: alloy
     app.kubernetes.io/name: alloy

operations/helm/tests/controller-statefulset-pdb-min-available/alloy/templates/configmap.yaml

@@ -4,6 +4,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: alloy
+  namespace: default
   labels:
     helm.sh/chart: alloy
     app.kubernetes.io/name: alloy

operations/helm/tests/controller-statefulset-pdb-min-available/alloy/templates/controllers/statefulset.yaml

@@ -4,6 +4,7 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: alloy
+  namespace: default
   labels:
     helm.sh/chart: alloy
     app.kubernetes.io/name: alloy

operations/helm/tests/controller-statefulset-pdb-min-available/alloy/templates/service.yaml

@@ -4,6 +4,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: alloy
+  namespace: default
   labels:
     helm.sh/chart: alloy
     app.kubernetes.io/name: alloy

operations/helm/tests/controller-volumes-extra/alloy/templates/configmap.yaml

@@ -4,6 +4,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: alloy
+  namespace: default
   labels:
     helm.sh/chart: alloy
     app.kubernetes.io/name: alloy

operations/helm/tests/controller-volumes-extra/alloy/templates/controllers/daemonset.yaml

@@ -4,6 +4,7 @@ apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: alloy
+  namespace: default
   labels:
     helm.sh/chart: alloy
     app.kubernetes.io/name: alloy

operations/helm/tests/controller-volumes-extra/alloy/templates/service.yaml

@@ -4,6 +4,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: alloy
+  namespace: default
   labels:
     helm.sh/chart: alloy
     app.kubernetes.io/name: alloy

operations/helm/tests/create-daemonset-hostnetwork/alloy/templates/configmap.yaml

@@ -4,6 +4,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: alloy
+  namespace: default
   labels:
     helm.sh/chart: alloy
     app.kubernetes.io/name: alloy

operations/helm/tests/create-daemonset-hostnetwork/alloy/templates/controllers/daemonset.yaml

@@ -4,6 +4,7 @@ apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: alloy
+  namespace: default
   labels:
     helm.sh/chart: alloy
     app.kubernetes.io/name: alloy

operations/helm/tests/create-daemonset-hostnetwork/alloy/templates/service.yaml

@@ -4,6 +4,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: alloy
+  namespace: default
   labels:
     helm.sh/chart: alloy
     app.kubernetes.io/name: alloy

operations/helm/tests/create-daemonset/alloy/templates/configmap.yaml

@@ -4,6 +4,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: alloy
+  namespace: default
   labels:
     helm.sh/chart: alloy
     app.kubernetes.io/name: alloy

operations/helm/tests/create-daemonset/alloy/templates/controllers/daemonset.yaml

@@ -4,6 +4,7 @@ apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: alloy
+  namespace: default
   labels:
     helm.sh/chart: alloy
     app.kubernetes.io/name: alloy

operations/helm/tests/create-daemonset/alloy/templates/service.yaml

@@ -4,6 +4,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: alloy
+  namespace: default
   labels:
     helm.sh/chart: alloy
     app.kubernetes.io/name: alloy

operations/helm/tests/create-deployment-autoscaling/alloy/templates/configmap.yaml

@@ -4,6 +4,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: alloy
+  namespace: default
   labels:
     helm.sh/chart: alloy
     app.kubernetes.io/name: alloy

operations/helm/tests/create-deployment-autoscaling/alloy/templates/controllers/deployment.yaml

@@ -4,6 +4,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: alloy
+  namespace: default
   labels:
     helm.sh/chart: alloy
     app.kubernetes.io/name: alloy

operations/helm/tests/create-deployment-autoscaling/alloy/templates/hpa.yaml

@@ -4,6 +4,7 @@ apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
 metadata:
   name: alloy
+  namespace: default
   labels:
     helm.sh/chart: alloy
     app.kubernetes.io/name: alloy

operations/helm/tests/create-deployment-autoscaling/alloy/templates/service.yaml

@@ -4,6 +4,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: alloy
+  namespace: default
   labels:
     helm.sh/chart: alloy
     app.kubernetes.io/name: alloy