diff --git a/templates/_helpers.tpl b/templates/_helpers.tpl index 16b8f9a..177b0c1 100644 --- a/templates/_helpers.tpl +++ b/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 -}} \ No newline at end of file diff --git a/templates/configmap.yaml b/templates/configmap.yaml index c9b0d2d..8f16078 100644 --- a/templates/configmap.yaml +++ b/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 }} diff --git a/templates/database/statefulset.yaml b/templates/database/statefulset.yaml index fc31918..ca2bff2 100644 --- a/templates/database/statefulset.yaml +++ b/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 }} diff --git a/templates/headless-service.yml b/templates/headless-service.yml index bc40082..c8ff49f 100644 --- a/templates/headless-service.yml +++ b/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 }} diff --git a/templates/hpa.yaml b/templates/hpa.yaml index 05e76d9..2f1e91a 100644 --- a/templates/hpa.yaml +++ b/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: diff --git a/templates/ingress.yaml b/templates/ingress.yaml index 85f21e1..4ad1656 100644 --- a/templates/ingress.yaml +++ b/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 }} diff --git a/templates/objectstorage/statefulset.yaml b/templates/objectstorage/statefulset.yaml index 32519f2..b45a1cd 100644 --- a/templates/objectstorage/statefulset.yaml +++ b/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 }} diff --git a/templates/search/statefulset.yaml b/templates/search/statefulset.yaml index 83ba84c..3c26ee6 100644 --- a/templates/search/statefulset.yaml +++ b/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 }} diff --git a/templates/service.yaml b/templates/service.yaml index c6684cd..023dece 100644 --- a/templates/service.yaml +++ b/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 }} diff --git a/templates/serviceaccount.yaml b/templates/serviceaccount.yaml index 3088957..87536b7 100644 --- a/templates/serviceaccount.yaml +++ b/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 diff --git a/templates/statefulset.yaml b/templates/statefulset.yaml index b9530a6..9a1267e 100644 --- a/templates/statefulset.yaml +++ b/templates/statefulset.yaml @@ -2,6 +2,7 @@ apiVersion: apps/v1 kind: StatefulSet metadata: name: {{ include "liferay.fullname" . }} + namespace: {{ include "liferay.namespace" . | quote }} labels: app: {{ $.Chart.Name }} {{- include "liferay.labels" . | nindent 4 }} diff --git a/templates/tests/test-connection.yaml b/templates/tests/test-connection.yaml index 76e2c88..1826309 100644 --- a/templates/tests/test-connection.yaml +++ b/templates/tests/test-connection.yaml @@ -2,6 +2,7 @@ apiVersion: v1 kind: Pod metadata: name: "{{ include "liferay.fullname" . }}-test-connection" + namespace: {{ include "liferay.namespace" . | quote }} labels: {{- include "liferay.labels" . | nindent 4 }} annotations: