fix namespace

pli01 · Jun 8, 2024 · 0905ef4 · 0905ef4
1 parent 6d068b9
commit 0905ef4
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 0 deletions.
diff --git a/charts/whoami/templates/_helpers.tpl b/charts/whoami/templates/_helpers.tpl
@@ -30,6 +30,14 @@ Create chart name and version as used by the chart label.
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
+{{/*
+Expand the namespace of the release.
+Allows overriding it for multi-namespace deployments in combined charts.
+*/}}
+{{- define "whoami.namespace" -}}
+{{- default .Release.Namespace .Values.namespaceOverride | trunc 63 | trimSuffix "-" -}}
+{{- end }}
+
 {{/*
 Common labels
 */}}

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

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

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

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

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

diff --git a/charts/whoami/values.yaml b/charts/whoami/values.yaml
@@ -12,6 +12,7 @@ image:
 
 imagePullSecrets: []
 nameOverride: ""
+namespaceOverride: ""
 fullnameOverride: ""
 
 # containerArgs: []