diff --git a/helm/dagster/charts/dagster-user-deployments/templates/configmap-env-shared.yaml b/helm/dagster/charts/dagster-user-deployments/templates/configmap-env-shared.yaml index 46ac44c6df60d..e52dcc174165d 100644 --- a/helm/dagster/charts/dagster-user-deployments/templates/configmap-env-shared.yaml +++ b/helm/dagster/charts/dagster-user-deployments/templates/configmap-env-shared.yaml @@ -3,6 +3,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: {{ template "dagster.fullname" $ -}}-user-deployments-shared-env + namespace: {{ $.Release.Namespace }} labels: app: {{ template "dagster.name" $ }} chart: {{ template "dagster.chart" $ }} diff --git a/helm/dagster/charts/dagster-user-deployments/templates/configmap-env-user.yaml b/helm/dagster/charts/dagster-user-deployments/templates/configmap-env-user.yaml index ed76b5000d732..93fcdc6b25f38 100644 --- a/helm/dagster/charts/dagster-user-deployments/templates/configmap-env-user.yaml +++ b/helm/dagster/charts/dagster-user-deployments/templates/configmap-env-user.yaml @@ -3,6 +3,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: {{ template "dagster.fullname" $ -}}-{{- $deployment.name }}-user-env + namespace: {{ $.Release.Namespace }} labels: app: {{ template "dagster.name" $ }} chart: {{ template "dagster.chart" $ }} diff --git a/helm/dagster/charts/dagster-user-deployments/templates/deployment-user.yaml b/helm/dagster/charts/dagster-user-deployments/templates/deployment-user.yaml index a3f3d55f265a4..bc8f561999e7d 100644 --- a/helm/dagster/charts/dagster-user-deployments/templates/deployment-user.yaml +++ b/helm/dagster/charts/dagster-user-deployments/templates/deployment-user.yaml @@ -8,6 +8,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: {{ include "dagster.fullname" $ -}}-{{- $deployment.name }} + namespace: {{ $.Release.Namespace }} labels: {{- include "dagster.labels" $ | nindent 4 }} component: user-deployments diff --git a/helm/dagster/charts/dagster-user-deployments/templates/role.yaml b/helm/dagster/charts/dagster-user-deployments/templates/role.yaml index 54bda8e9d7b7f..66c713800e909 100644 --- a/helm/dagster/charts/dagster-user-deployments/templates/role.yaml +++ b/helm/dagster/charts/dagster-user-deployments/templates/role.yaml @@ -3,6 +3,7 @@ kind: Role apiVersion: rbac.authorization.k8s.io/v1 metadata: name: {{ template "dagster.fullname" . }}-role + namespace: {{ .Release.Namespace }} labels: {{ include "dagster.labels" . | nindent 4 }} # Allow the Dagster service account to read and write Kubernetes jobs, deployments, pods, and events. diff --git a/helm/dagster/charts/dagster-user-deployments/templates/rolebinding.yaml b/helm/dagster/charts/dagster-user-deployments/templates/rolebinding.yaml index f0f436d7c2e20..6d8a1de9bc123 100644 --- a/helm/dagster/charts/dagster-user-deployments/templates/rolebinding.yaml +++ b/helm/dagster/charts/dagster-user-deployments/templates/rolebinding.yaml @@ -3,6 +3,7 @@ kind: RoleBinding apiVersion: rbac.authorization.k8s.io/v1 metadata: name: {{ template "dagster.fullname" . }}-rolebinding + namespace: {{ .Release.Namespace }} labels: {{ include "dagster.labels" . | nindent 4 }} subjects: diff --git a/helm/dagster/charts/dagster-user-deployments/templates/service-user.yaml b/helm/dagster/charts/dagster-user-deployments/templates/service-user.yaml index 9b27a93bce2e7..a6d1d7de88a2b 100644 --- a/helm/dagster/charts/dagster-user-deployments/templates/service-user.yaml +++ b/helm/dagster/charts/dagster-user-deployments/templates/service-user.yaml @@ -3,6 +3,7 @@ apiVersion: v1 kind: Service metadata: name: {{ $deployment.name }} + namespace: {{ $.Release.Namespace }} labels: {{- include "dagster.labels" $ | nindent 4 }} component: user-deployments diff --git a/helm/dagster/charts/dagster-user-deployments/templates/serviceaccount.yaml b/helm/dagster/charts/dagster-user-deployments/templates/serviceaccount.yaml index 98be615c5289c..a3fba018bf4f5 100644 --- a/helm/dagster/charts/dagster-user-deployments/templates/serviceaccount.yaml +++ b/helm/dagster/charts/dagster-user-deployments/templates/serviceaccount.yaml @@ -9,6 +9,7 @@ apiVersion: v1 kind: ServiceAccount metadata: name: {{ include "dagsterUserDeployments.serviceAccountName" . }} + namespace: {{ .Release.Namespace }} labels: {{ include "dagster.labels" . | nindent 4 }} annotations: {{- .Values.serviceAccount.annotations | toYaml | nindent 4 }} automountServiceAccountToken: false diff --git a/helm/dagster/templates/configmap-celery.yaml b/helm/dagster/templates/configmap-celery.yaml index e3971cf3a641f..33d6ea8482084 100644 --- a/helm/dagster/templates/configmap-celery.yaml +++ b/helm/dagster/templates/configmap-celery.yaml @@ -8,6 +8,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: {{ template "dagster.fullname" $ }}-celery-{{- $queue.name }} + namespace: {{ $.Release.Namespace }} labels: app: {{ template "dagster.name" $ }} chart: {{ template "dagster.chart" $ }} diff --git a/helm/dagster/templates/configmap-env-celery.yaml b/helm/dagster/templates/configmap-env-celery.yaml index 62ae07a46f18e..842f1fd99a271 100644 --- a/helm/dagster/templates/configmap-env-celery.yaml +++ b/helm/dagster/templates/configmap-env-celery.yaml @@ -4,6 +4,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: {{ template "dagster.fullname" . }}-celery-worker-env + namespace: {{ .Release.Namespace }} labels: app: {{ template "dagster.name" . }} chart: {{ template "dagster.chart" . }} diff --git a/helm/dagster/templates/configmap-env-daemon.yaml b/helm/dagster/templates/configmap-env-daemon.yaml index f17e598e7f048..97f16fd853715 100644 --- a/helm/dagster/templates/configmap-env-daemon.yaml +++ b/helm/dagster/templates/configmap-env-daemon.yaml @@ -3,6 +3,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: {{ template "dagster.fullname" $ -}}-daemon-env + namespace: {{ $.Release.Namespace }} labels: app: {{ template "dagster.name" $ }} chart: {{ template "dagster.chart" $ }} diff --git a/helm/dagster/templates/configmap-env-flower.yaml b/helm/dagster/templates/configmap-env-flower.yaml index 7423055eddaa1..2fe392ee520fa 100644 --- a/helm/dagster/templates/configmap-env-flower.yaml +++ b/helm/dagster/templates/configmap-env-flower.yaml @@ -3,6 +3,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: {{ template "dagster.fullname" . }}-flower-env + namespace: {{ .Release.Namespace }} labels: app: {{ template "dagster.name" . }} chart: {{ template "dagster.chart" . }} diff --git a/helm/dagster/templates/configmap-env-pipeline-run.yaml b/helm/dagster/templates/configmap-env-pipeline-run.yaml index de65db0438ac0..b85f2aad9613d 100644 --- a/helm/dagster/templates/configmap-env-pipeline-run.yaml +++ b/helm/dagster/templates/configmap-env-pipeline-run.yaml @@ -2,6 +2,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: {{ template "dagster.fullname" . }}-pipeline-env + namespace: {{ .Release.Namespace }} labels: app: {{ template "dagster.name" . }} chart: {{ template "dagster.chart" . }} diff --git a/helm/dagster/templates/configmap-env-webserver.yaml b/helm/dagster/templates/configmap-env-webserver.yaml index 566a67cec98e3..586d121bdf558 100644 --- a/helm/dagster/templates/configmap-env-webserver.yaml +++ b/helm/dagster/templates/configmap-env-webserver.yaml @@ -3,6 +3,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: {{ template "dagster.fullname" . }}-webserver-env + namespace: {{ .Release.Namespace }} labels: app: {{ template "dagster.name" . }} chart: {{ template "dagster.chart" . }} diff --git a/helm/dagster/templates/configmap-instance.yaml b/helm/dagster/templates/configmap-instance.yaml index 9f87bf8f5aa6b..ab84f00c4dd48 100644 --- a/helm/dagster/templates/configmap-instance.yaml +++ b/helm/dagster/templates/configmap-instance.yaml @@ -2,6 +2,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: {{ template "dagster.fullname" . }}-instance + namespace: {{ .Release.Namespace }} labels: app: {{ template "dagster.name" . }} chart: {{ template "dagster.chart" . }} diff --git a/helm/dagster/templates/configmap-workspace.yaml b/helm/dagster/templates/configmap-workspace.yaml index 913e4c6a3533e..a34b2d96338f3 100644 --- a/helm/dagster/templates/configmap-workspace.yaml +++ b/helm/dagster/templates/configmap-workspace.yaml @@ -20,6 +20,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: {{ include "dagster.workspace.configmapName" . }} + namespace: {{ .Release.Namespace }} labels: app: {{ template "dagster.name" . }} chart: {{ template "dagster.chart" . }} diff --git a/helm/dagster/templates/deployment-celery-queues.yaml b/helm/dagster/templates/deployment-celery-queues.yaml index e9ceb33bb90c5..6b0257dc8bb80 100644 --- a/helm/dagster/templates/deployment-celery-queues.yaml +++ b/helm/dagster/templates/deployment-celery-queues.yaml @@ -6,6 +6,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: {{ include "dagster.workers.fullname" $ -}}-{{- $queue.name }} + namespace: {{ $.Release.Namespace }} labels: {{- include "dagster.labels" $ | nindent 4 }} component: celery diff --git a/helm/dagster/templates/deployment-daemon.yaml b/helm/dagster/templates/deployment-daemon.yaml index 0a8db90546b96..7d14df0151535 100644 --- a/helm/dagster/templates/deployment-daemon.yaml +++ b/helm/dagster/templates/deployment-daemon.yaml @@ -4,6 +4,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: {{ include "dagster.fullname" $ -}}-daemon + namespace: {{ $.Release.Namespace }} labels: {{- include "dagster.labels" $ | nindent 4 }} component: dagster-daemon diff --git a/helm/dagster/templates/deployment-flower.yaml b/helm/dagster/templates/deployment-flower.yaml index ca0ed535362ab..82bb10293f51f 100644 --- a/helm/dagster/templates/deployment-flower.yaml +++ b/helm/dagster/templates/deployment-flower.yaml @@ -3,6 +3,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: {{ include "dagster.flower.fullname" . }} + namespace: {{ .Release.Namespace }} labels: {{- include "dagster.labels" . | nindent 4 }} component: flower diff --git a/helm/dagster/templates/helpers/_deployment-webserver.tpl b/helm/dagster/templates/helpers/_deployment-webserver.tpl index ee9074138dd74..62e433e9912fb 100644 --- a/helm/dagster/templates/helpers/_deployment-webserver.tpl +++ b/helm/dagster/templates/helpers/_deployment-webserver.tpl @@ -5,6 +5,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: {{ template "dagster.webserver.fullname" . }} + namespace: {{ .Release.Namespace }} labels: {{- include "dagster.labels" . | nindent 4 }} component: {{ include "dagster.webserver.componentName" . }} diff --git a/helm/dagster/templates/helpers/_service-webserver.tpl b/helm/dagster/templates/helpers/_service-webserver.tpl index de2fae0c5f2b9..cfb927959beca 100644 --- a/helm/dagster/templates/helpers/_service-webserver.tpl +++ b/helm/dagster/templates/helpers/_service-webserver.tpl @@ -5,6 +5,7 @@ apiVersion: v1 kind: Service metadata: name: {{ include "dagster.webserver.fullname" . }} + namespace: {{ .Release.Namespace }} labels: {{- include "dagster.labels" . | nindent 4 }} component: {{ include "dagster.webserver.componentName" . }} diff --git a/helm/dagster/templates/ingress.yaml b/helm/dagster/templates/ingress.yaml index 554658c0fbfaf..fb89a6d2be00b 100644 --- a/helm/dagster/templates/ingress.yaml +++ b/helm/dagster/templates/ingress.yaml @@ -8,6 +8,7 @@ apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: {{ include "dagster.fullname" . }}-ingress + namespace: {{ .Release.Namespace }} labels: {{- include "dagster.labels" . | nindent 4 }} {{- range $key, $value := .Values.ingress.labels }} diff --git a/helm/dagster/templates/job-instance-migrate.yaml b/helm/dagster/templates/job-instance-migrate.yaml index a108b6ab61c28..ac4971ed88548 100644 --- a/helm/dagster/templates/job-instance-migrate.yaml +++ b/helm/dagster/templates/job-instance-migrate.yaml @@ -4,6 +4,7 @@ apiVersion: batch/v1 kind: Job metadata: name: {{ include "dagster.webserver.migrate" . | quote }} + namespace: {{ .Release.Namespace }} annotations: {{- range $key, $value := $_.Values.dagsterWebserver.annotations }} {{ $key }}: {{ $value | squote }} diff --git a/helm/dagster/templates/role.yaml b/helm/dagster/templates/role.yaml index bba8f1a4b04a1..5797cdd2305f1 100644 --- a/helm/dagster/templates/role.yaml +++ b/helm/dagster/templates/role.yaml @@ -3,6 +3,7 @@ kind: Role apiVersion: rbac.authorization.k8s.io/v1 metadata: name: {{ template "dagster.fullname" . }}-role + namespace: {{ .Release.Namespace }} labels: app: {{ template "dagster.name" . }} chart: {{ template "dagster.chart" . }} diff --git a/helm/dagster/templates/rolebinding.yaml b/helm/dagster/templates/rolebinding.yaml index 3930360e7bc2f..7391ff24c171e 100644 --- a/helm/dagster/templates/rolebinding.yaml +++ b/helm/dagster/templates/rolebinding.yaml @@ -3,6 +3,7 @@ kind: RoleBinding apiVersion: rbac.authorization.k8s.io/v1 metadata: name: {{ template "dagster.fullname" . }}-rolebinding + namespace: {{ .Release.Namespace }} labels: app: {{ template "dagster.name" . }} chart: {{ template "dagster.chart" . }} diff --git a/helm/dagster/templates/secret-celery-config.yaml b/helm/dagster/templates/secret-celery-config.yaml index d4fdd8d216b72..42bdb73b3a5d5 100644 --- a/helm/dagster/templates/secret-celery-config.yaml +++ b/helm/dagster/templates/secret-celery-config.yaml @@ -3,6 +3,7 @@ apiVersion: v1 kind: Secret metadata: name: {{ .Values.global.celeryConfigSecretName }} + namespace: {{ .Release.Namespace }} labels: app: "{{ template "dagster.name" . }}" chart: "{{ template "dagster.chart" . }}" diff --git a/helm/dagster/templates/secret-postgres.yaml b/helm/dagster/templates/secret-postgres.yaml index dd903f6756e17..a007e703c2776 100644 --- a/helm/dagster/templates/secret-postgres.yaml +++ b/helm/dagster/templates/secret-postgres.yaml @@ -3,6 +3,7 @@ apiVersion: v1 kind: Secret metadata: name: {{ include "dagster.postgresql.secretName" . }} + namespace: {{ .Release.Namespace }} labels: app: "{{ template "dagster.name" . }}" chart: "{{ template "dagster.chart" . }}" diff --git a/helm/dagster/templates/service-flower.yaml b/helm/dagster/templates/service-flower.yaml index 51abb08360903..0842224a8274c 100644 --- a/helm/dagster/templates/service-flower.yaml +++ b/helm/dagster/templates/service-flower.yaml @@ -3,6 +3,7 @@ apiVersion: v1 kind: Service metadata: name: {{ template "dagster.fullname" . }}-flower-service + namespace: {{ .Release.Namespace }} labels: {{- include "dagster.labels" . | nindent 4 }} component: flower diff --git a/helm/dagster/templates/serviceaccount.yaml b/helm/dagster/templates/serviceaccount.yaml index 3b1e054f3f09d..1a4886efb1fa8 100644 --- a/helm/dagster/templates/serviceaccount.yaml +++ b/helm/dagster/templates/serviceaccount.yaml @@ -3,6 +3,7 @@ apiVersion: v1 kind: ServiceAccount metadata: name: {{ include "dagster.serviceAccountName" . }} + namespace: {{ .Release.Namespace }} labels: {{ include "dagster.labels" . | nindent 4 }} annotations: {{- .Values.serviceAccount.annotations | toYaml | nindent 4 }} automountServiceAccountToken: false