feat: explicitly set namespace in templates

flipt-io · Sep 23, 2024 · 1028083 · 1028083
1 parent 05510e5
commit 1028083
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 1 deletion.
diff --git a/charts/flipt/templates/configmap.yaml b/charts/flipt/templates/configmap.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ include "flipt.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   annotations:
     "helm.sh/hook": pre-install,pre-upgrade
     "helm.sh/hook-weight": "-1"

diff --git a/charts/flipt/templates/configmap_ssh.yaml b/charts/flipt/templates/configmap_ssh.yaml
@@ -4,6 +4,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ include "flipt.fullname" . }}-ssh-known-hosts
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "flipt.labels" . | nindent 4 }}
 data:

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

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

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

diff --git a/charts/flipt/templates/migration_job.yaml b/charts/flipt/templates/migration_job.yaml
@@ -3,6 +3,7 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: {{ include "flipt.migration_name" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "flipt.labels" . | nindent 4 }}
   annotations:

diff --git a/charts/flipt/templates/pdb.yaml b/charts/flipt/templates/pdb.yaml
@@ -4,6 +4,7 @@ apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
   name: {{ template "flipt.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels: {{- include "flipt.labels" . | nindent 4 }}
 spec:
   maxUnavailable: {{ default "25%" .Values.pdb.maxUnavailable }} 

diff --git a/charts/flipt/templates/pvc.yaml b/charts/flipt/templates/pvc.yaml
@@ -3,6 +3,7 @@ kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
   name: {{ include "flipt.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "flipt.labels" . | nindent 4 }}
   {{- if or .Values.persistence.annotations .Values.commonAnnotations }}

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

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

diff --git a/charts/flipt/templates/servicemonitor.yaml b/charts/flipt/templates/servicemonitor.yaml
@@ -4,7 +4,7 @@ kind: ServiceMonitor
 metadata:
   name: {{ template "flipt.fullname" . }}
   {{- with .Values.metrics.serviceMonitor.namespace }}
-  namespace: {{ . }}
+  namespace: {{ .Release.Namespace }}
   {{- end }}
   labels:
     {{- include "flipt.labels" . | nindent 4 }}