diff --git a/src/helm/desk/templates/backend_deployment.yaml b/src/helm/desk/templates/backend_deployment.yaml index 55243d5ea..ddc88f2b0 100644 --- a/src/helm/desk/templates/backend_deployment.yaml +++ b/src/helm/desk/templates/backend_deployment.yaml @@ -5,6 +5,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: {{ $fullName }} + namespace: {{ .Release.Namespace | quote }} labels: {{- include "desk.common.labels" (list . $component) | nindent 4 }} spec: diff --git a/src/helm/desk/templates/backend_job.yaml b/src/helm/desk/templates/backend_job.yaml index 32e32d549..0bb863013 100644 --- a/src/helm/desk/templates/backend_job.yaml +++ b/src/helm/desk/templates/backend_job.yaml @@ -5,6 +5,7 @@ apiVersion: batch/v1 kind: Job metadata: name: {{ $fullName }}-migrate + namespace: {{ .Release.Namespace | quote }} {{- with .Values.backend.migrateJobAnnotations }} annotations: {{- toYaml . | nindent 4 }} diff --git a/src/helm/desk/templates/backend_svc.yaml b/src/helm/desk/templates/backend_svc.yaml index b87678d1c..31e823a08 100644 --- a/src/helm/desk/templates/backend_svc.yaml +++ b/src/helm/desk/templates/backend_svc.yaml @@ -5,6 +5,7 @@ apiVersion: v1 kind: Service metadata: name: {{ $fullName }} + namespace: {{ .Release.Namespace | quote }} labels: {{- include "desk.common.labels" (list . $component) | nindent 4 }} annotations: diff --git a/src/helm/desk/templates/frontend_deployment.yaml b/src/helm/desk/templates/frontend_deployment.yaml index db9ae60ca..9bea804b7 100644 --- a/src/helm/desk/templates/frontend_deployment.yaml +++ b/src/helm/desk/templates/frontend_deployment.yaml @@ -5,6 +5,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: {{ $fullName }} + namespace: {{ .Release.Namespace | quote }} labels: {{- include "desk.common.labels" (list . $component) | nindent 4 }} spec: diff --git a/src/helm/desk/templates/frontend_svc.yaml b/src/helm/desk/templates/frontend_svc.yaml index 6a0413f35..8df2220d6 100644 --- a/src/helm/desk/templates/frontend_svc.yaml +++ b/src/helm/desk/templates/frontend_svc.yaml @@ -5,6 +5,7 @@ apiVersion: v1 kind: Service metadata: name: {{ $fullName }} + namespace: {{ .Release.Namespace | quote }} labels: {{- include "desk.common.labels" (list . $component) | nindent 4 }} annotations: diff --git a/src/helm/desk/templates/ingress.yaml b/src/helm/desk/templates/ingress.yaml index cc31dbb26..fa6162cf9 100644 --- a/src/helm/desk/templates/ingress.yaml +++ b/src/helm/desk/templates/ingress.yaml @@ -15,6 +15,7 @@ apiVersion: extensions/v1beta1 kind: Ingress metadata: name: {{ $fullName }} + namespace: {{ .Release.Namespace | quote }} labels: {{- include "desk.labels" . | nindent 4 }} {{- with .Values.ingress.annotations }} diff --git a/src/helm/desk/templates/ingress_admin.yaml b/src/helm/desk/templates/ingress_admin.yaml index de66e7aa7..3324fca0c 100644 --- a/src/helm/desk/templates/ingress_admin.yaml +++ b/src/helm/desk/templates/ingress_admin.yaml @@ -15,6 +15,7 @@ apiVersion: extensions/v1beta1 kind: Ingress metadata: name: {{ $fullName }}-admin + namespace: {{ .Release.Namespace | quote }} labels: {{- include "desk.labels" . | nindent 4 }} {{- with .Values.ingressAdmin.annotations }} diff --git a/src/helm/desk/templates/secrets.yaml b/src/helm/desk/templates/secrets.yaml index 011f357d2..799bafe7e 100644 --- a/src/helm/desk/templates/secrets.yaml +++ b/src/helm/desk/templates/secrets.yaml @@ -2,6 +2,7 @@ apiVersion: v1 kind: Secret metadata: name: backend + namespace: {{ .Release.Namespace | quote }} stringData: DJANGO_SUPERUSER_PASSWORD: {{ .Values.djangoSuperUserPass }} DJANGO_SECRET_KEY: {{ .Values.djangoSecretKey }}