Helm chart: explicitly include namespace in created resources

projectnessie · Oct 7, 2024 · 145f7e8 · 145f7e8
1 parent a5fbb2f
commit 145f7e8
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 1 deletion.
diff --git a/helm/nessie/templates/configmap.yaml b/helm/nessie/templates/configmap.yaml
@@ -20,6 +20,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ include "nessie.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "nessie.labels" . | nindent 4 }}
     {{- if .Values.configMapLabels }}

diff --git a/helm/nessie/templates/deployment.yaml b/helm/nessie/templates/deployment.yaml
@@ -20,6 +20,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "nessie.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "nessie.labels" . | nindent 4 }}
     {{- if .Values.podLabels }}

diff --git a/helm/nessie/templates/hpa.yaml b/helm/nessie/templates/hpa.yaml
@@ -27,6 +27,7 @@ apiVersion: autoscaling/v2beta1
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "nessie.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "nessie.labels" . | nindent 4 }}
 spec:

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

diff --git a/helm/nessie/templates/service.yaml b/helm/nessie/templates/service.yaml
@@ -20,6 +20,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "nessie.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "nessie.labels" . | nindent 4 }}
   {{- with .Values.service.annotations }}
@@ -43,6 +44,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "nessie.fullname" . }}-mgmt
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "nessie.labels" . | nindent 4 }}
   {{- with .Values.managementService.annotations }}
@@ -70,6 +72,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "nessie.fullname" $ }}{{ $svc.nameSuffix }}
+  namespace: {{ $.Release.Namespace }}
   labels:
     {{- include "nessie.labels" $ | nindent 4 }}
   {{- with $svc.annotations }}

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

diff --git a/helm/nessie/templates/servicemonitor.yaml b/helm/nessie/templates/servicemonitor.yaml
@@ -20,7 +20,8 @@
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
-  name: {{ template "nessie.fullname" . }}
+  name: {{ include "nessie.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "nessie.labels" . | nindent 4 }}
     {{- if .Values.serviceMonitor.labels }}

diff --git a/helm/nessie/templates/storage.yaml b/helm/nessie/templates/storage.yaml
@@ -21,6 +21,7 @@ apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   name: {{ include "nessie.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "nessie.labels" . | nindent 4 }}
 spec: