Merge pull request #49 from rotty3000/LCD-44733

LCD-44733 always set the namespace

Author: Raymond Augé

templates/_helpers.tpl

@@ -70,3 +70,10 @@ Create the name of the service account to use
 {{- default "default" .Values.serviceAccount.name }}
 {{- end }}
 {{- end }}
+
+{{/*
+Allow the release namespace to be overridden for multi-namespace deployments in combined charts.
+*/}}
+{{- define "liferay.namespace" -}}
+{{- default .Release.Namespace .Values.namespaceOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}

templates/configmap.yaml

@@ -2,6 +2,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ include "liferay.fullname" . }}
+  namespace: {{ include "liferay.namespace" . | quote }}
   labels:
     {{- include "liferay.labels" . | nindent 4 }}
   {{- with .Values.configmap.annotations }}

templates/database/statefulset.yaml

@@ -4,6 +4,7 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: {{ include "liferay.fullname" $ }}-database
+  namespace: {{ include "liferay.namespace" $ | quote }}
   labels:
     app: {{ $.Chart.Name }}-database
     {{- include "liferay.labels" $ | nindent 4 }}
@@ -104,6 +105,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "liferay.fullname" $ }}-database
+  namespace: {{ include "liferay.namespace" $ | quote }}
   labels:
     app: {{ $.Chart.Name }}-database
     {{- include "liferay.labels" $ | nindent 4 }}
@@ -122,6 +124,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "liferay.fullname" $ }}-database-headless
+  namespace: {{ include "liferay.namespace" $ | quote }}
   labels:
     app: {{ $.Chart.Name }}-database
     {{- include "liferay.labels" $ | nindent 4 }}

templates/headless-service.yml

@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "liferay.fullname" . }}-headless
+  namespace: {{ include "liferay.namespace" . | quote }}
   labels:
     app: {{ $.Chart.Name }}
     {{- include "liferay.labels" . | nindent 4 }}

templates/hpa.yaml

@@ -3,6 +3,7 @@ apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "liferay.fullname" . }}
+  namespace: {{ include "liferay.namespace" . | quote }}
   labels:
     {{- include "liferay.labels" . | nindent 4 }}
 spec:

templates/ingress.yaml

@@ -3,6 +3,7 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ include "liferay.fullname" . }}
+  namespace: {{ include "liferay.namespace" . | quote }}
   labels:
     {{- include "liferay.labels" . | nindent 4 }}
   {{- with .Values.ingress.annotations }}

templates/objectstorage/statefulset.yaml

@@ -4,6 +4,7 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: {{ include "liferay.fullname" $ }}-objectstorage
+  namespace: {{ include "liferay.namespace" $ | quote }}
   labels:
     app: {{ $.Chart.Name }}-objectstorage
     {{- include "liferay.labels" $ | nindent 4 }}
@@ -148,6 +149,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "liferay.fullname" $ }}-objectstorage
+  namespace: {{ include "liferay.namespace" $ | quote }}
   labels:
     app: {{ $.Chart.Name }}-objectstorage
     {{- include "liferay.labels" $ | nindent 4 }}
@@ -170,6 +172,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "liferay.fullname" $ }}-objectstorage-headless
+  namespace: {{ include "liferay.namespace" $ | quote }}
   labels:
     app: {{ $.Chart.Name }}-objectstorage
     {{- include "liferay.labels" $ | nindent 4 }}
@@ -189,6 +192,7 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ include "liferay.fullname" $ }}-objectstorage
+  namespace: {{ include "liferay.namespace" $ | quote }}
   labels:
     app: {{ $.Chart.Name }}-objectstorage
     {{- include "liferay.labels" $ | nindent 4 }}

templates/search/statefulset.yaml

@@ -4,6 +4,7 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: {{ include "liferay.fullname" $ }}-search
+  namespace: {{ include "liferay.namespace" $ | quote }}
   labels:
     app: {{ $.Chart.Name }}-search
     {{- include "liferay.labels" $ | nindent 4 }}
@@ -155,6 +156,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "liferay.fullname" $ }}-search
+  namespace: {{ include "liferay.namespace" $ | quote }}
   labels:
     app: {{ $.Chart.Name }}-search
     {{- include "liferay.labels" $ | nindent 4 }}
@@ -173,6 +175,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "liferay.fullname" $ }}-search-headless
+  namespace: {{ include "liferay.namespace" $ | quote }}
   labels:
     app: {{ $.Chart.Name }}-search
     {{- include "liferay.labels" $ | nindent 4 }}

templates/service.yaml

@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "liferay.fullname" . }}
+  namespace: {{ include "liferay.namespace" . | quote }}
   labels:
     app: {{ $.Chart.Name }}
     {{- include "liferay.labels" . | nindent 4 }}

templates/serviceaccount.yaml

@@ -3,6 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ include "liferay.serviceAccountName" . }}
+  namespace: {{ include "liferay.namespace" . | quote }}
   labels:
     {{- include "liferay.labels" . | nindent 4 }}
   {{- with .Values.serviceAccount.annotations }}
@@ -15,6 +16,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   name: {{ include "liferay.fullname" . }}-role
+  namespace: {{ include "liferay.namespace" . | quote }}
   labels:
     {{- include "liferay.labels" . | nindent 4 }}
 rules:
@@ -26,12 +28,13 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   name: {{ include "liferay.fullname" . }}-rolebinding
+  namespace: {{ include "liferay.namespace" . | quote }}
   labels:
     {{- include "liferay.labels" . | nindent 4 }}
 subjects:
 - kind: ServiceAccount
   name: {{ include "liferay.serviceAccountName" . }} # Service account name
-  namespace: {{ .Release.Namespace }} # Namespace the service account is deployed in
+  namespace: {{ include "liferay.namespace" . | quote }}
 roleRef:
   kind: Role
   name: {{ include "liferay.fullname" . }}-role # Name of the role