diff --git a/zammad/Chart.yaml b/zammad/Chart.yaml index 1f4359cc..867c22ff 100755 --- a/zammad/Chart.yaml +++ b/zammad/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: zammad -version: 15.6.2 +version: 15.6.3 appVersion: 6.5.2-85 description: Zammad is a web based open source helpdesk/customer support system with many features to manage customer communication via several channels like telephone, facebook, twitter, chat and e-mails. home: https://zammad.org diff --git a/zammad/templates/configmap-init.yaml b/zammad/templates/configmap-init.yaml index 5c99ae24..a8ec91c3 100644 --- a/zammad/templates/configmap-init.yaml +++ b/zammad/templates/configmap-init.yaml @@ -2,6 +2,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: {{ include "zammad.fullname" . }}-init + namespace: {{ .Release.Namespace }} labels: {{- include "zammad.labels" . | nindent 4 }} annotations: diff --git a/zammad/templates/configmap-nginx.yaml b/zammad/templates/configmap-nginx.yaml index d625736e..1d618c51 100644 --- a/zammad/templates/configmap-nginx.yaml +++ b/zammad/templates/configmap-nginx.yaml @@ -2,6 +2,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: {{ include "zammad.fullname" . }}-nginx + namespace: {{ .Release.Namespace }} labels: {{- include "zammad.labels" . | nindent 4 }} annotations: diff --git a/zammad/templates/cronjob-reindex.yaml b/zammad/templates/cronjob-reindex.yaml index c2273cb3..1ebee415 100755 --- a/zammad/templates/cronjob-reindex.yaml +++ b/zammad/templates/cronjob-reindex.yaml @@ -2,6 +2,7 @@ apiVersion: batch/v1 kind: CronJob metadata: name: {{ include "zammad.fullname" . }}-cronjob-reindex + namespace: {{ .Release.Namespace }} labels: {{- include "zammad.labels" . | nindent 4 }} app.kubernetes.io/component: zammad-cronjob-reindex diff --git a/zammad/templates/deployment-nginx.yaml b/zammad/templates/deployment-nginx.yaml index 65af2cc9..b6fa0885 100644 --- a/zammad/templates/deployment-nginx.yaml +++ b/zammad/templates/deployment-nginx.yaml @@ -2,6 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: {{ include "zammad.fullname" . }}-nginx + namespace: {{ .Release.Namespace }} labels: {{- include "zammad.labels" . | nindent 4 }} app.kubernetes.io/component: zammad-nginx diff --git a/zammad/templates/deployment-railsserver.yaml b/zammad/templates/deployment-railsserver.yaml index f2b2d48e..8d4b7e48 100644 --- a/zammad/templates/deployment-railsserver.yaml +++ b/zammad/templates/deployment-railsserver.yaml @@ -2,6 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: {{ include "zammad.fullname" . }}-railsserver + namespace: {{ .Release.Namespace }} labels: {{- include "zammad.labels" . | nindent 4 }} app.kubernetes.io/component: zammad-railsserver diff --git a/zammad/templates/deployment-scheduler.yaml b/zammad/templates/deployment-scheduler.yaml index f264317d..d120f3bf 100644 --- a/zammad/templates/deployment-scheduler.yaml +++ b/zammad/templates/deployment-scheduler.yaml @@ -2,6 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: {{ include "zammad.fullname" . }}-scheduler + namespace: {{ .Release.Namespace }} labels: {{- include "zammad.labels" . | nindent 4 }} app.kubernetes.io/component: zammad-scheduler diff --git a/zammad/templates/deployment-websocket.yaml b/zammad/templates/deployment-websocket.yaml index 491f1527..b2b5f6ad 100755 --- a/zammad/templates/deployment-websocket.yaml +++ b/zammad/templates/deployment-websocket.yaml @@ -2,6 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: {{ include "zammad.fullname" . }}-websocket + namespace: {{ .Release.Namespace }} labels: {{- include "zammad.labels" . | nindent 4 }} app.kubernetes.io/component: zammad-websocket diff --git a/zammad/templates/ingress.yaml b/zammad/templates/ingress.yaml index 22c31ead..343cbd64 100644 --- a/zammad/templates/ingress.yaml +++ b/zammad/templates/ingress.yaml @@ -16,6 +16,7 @@ apiVersion: extensions/v1beta1 kind: Ingress metadata: name: {{ $fullName }} + namespace: {{ .Release.Namespace }} labels: {{- include "zammad.labels" . | nindent 4 }} {{- with .Values.ingress.labels }} diff --git a/zammad/templates/job-init.yaml b/zammad/templates/job-init.yaml index 702008fd..985de1d4 100755 --- a/zammad/templates/job-init.yaml +++ b/zammad/templates/job-init.yaml @@ -7,6 +7,7 @@ metadata: {{- else }} name: {{ include "zammad.fullname" . }}-init {{- end}} + namespace: {{ .Release.Namespace }} # Helm post-install/post-upgrade hooks cannot be used here, because # helm's --wait flag causes a deadlock: the job waits for all resources to be ready, # but the pods need the job to work properly. diff --git a/zammad/templates/secrets.yaml b/zammad/templates/secrets.yaml index 0e472330..23e01900 100644 --- a/zammad/templates/secrets.yaml +++ b/zammad/templates/secrets.yaml @@ -3,6 +3,7 @@ apiVersion: v1 kind: Secret metadata: name: {{ include "zammad.autowizardSecretName" . }} + namespace: {{ .Release.Namespace }} labels: {{- include "zammad.labels" . | nindent 4 }} annotations: diff --git a/zammad/templates/service-nginx.yaml b/zammad/templates/service-nginx.yaml index e6654d62..0bd32075 100644 --- a/zammad/templates/service-nginx.yaml +++ b/zammad/templates/service-nginx.yaml @@ -2,6 +2,7 @@ apiVersion: v1 kind: Service metadata: name: {{ include "zammad.fullname" . }}-nginx + namespace: {{ .Release.Namespace }} labels: {{- include "zammad.labels" . | nindent 4 }} annotations: diff --git a/zammad/templates/service-railsserver.yaml b/zammad/templates/service-railsserver.yaml index 15159db0..2df64c23 100644 --- a/zammad/templates/service-railsserver.yaml +++ b/zammad/templates/service-railsserver.yaml @@ -2,6 +2,7 @@ apiVersion: v1 kind: Service metadata: name: {{ include "zammad.fullname" . }}-railsserver + namespace: {{ .Release.Namespace }} labels: {{- include "zammad.labels" . | nindent 4 }} annotations: diff --git a/zammad/templates/service-websocket.yaml b/zammad/templates/service-websocket.yaml index b1d96fa2..3f985a98 100644 --- a/zammad/templates/service-websocket.yaml +++ b/zammad/templates/service-websocket.yaml @@ -2,6 +2,7 @@ apiVersion: v1 kind: Service metadata: name: {{ include "zammad.fullname" . }}-websocket + namespace: {{ .Release.Namespace }} labels: {{- include "zammad.labels" . | nindent 4 }} annotations: diff --git a/zammad/templates/serviceaccount.yaml b/zammad/templates/serviceaccount.yaml index 37953cb3..2f2ff580 100644 --- a/zammad/templates/serviceaccount.yaml +++ b/zammad/templates/serviceaccount.yaml @@ -3,6 +3,7 @@ apiVersion: v1 kind: ServiceAccount metadata: name: {{ include "zammad.serviceAccountName" . }} + namespace: {{ .Release.Namespace }} labels: {{- include "zammad.labels" . | nindent 4 }} annotations: