diff --git a/zammad/Chart.yaml b/zammad/Chart.yaml index 1b806734..6a70307c 100644 --- a/zammad/Chart.yaml +++ b/zammad/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 name: zammad -version: 12.0.2 -appVersion: 6.3.0-16 +version: 12.0.3 +appVersion: 6.3.0-17 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 icon: https://raw.githubusercontent.com/zammad/zammad-documentation/main/images/zammad_logo_600x520.png diff --git a/zammad/ci/full-values.yaml b/zammad/ci/full-values.yaml index 720da7e7..cd174994 100644 --- a/zammad/ci/full-values.yaml +++ b/zammad/ci/full-values.yaml @@ -23,6 +23,9 @@ elasticsearch: security: existingSecret: elasticsearch-existing-secret +ingress: + enabled: true + minio: auth: existingSecret: minio-existing-secret diff --git a/zammad/templates/_helpers.tpl b/zammad/templates/_helpers.tpl index e5101494..48bbe19c 100644 --- a/zammad/templates/_helpers.tpl +++ b/zammad/templates/_helpers.tpl @@ -69,7 +69,7 @@ autowizard secret name {{- if .Values.secrets.autowizard.useExisting -}} {{ .Values.secrets.autowizard.secretName }} {{- else -}} -{{ template "zammad.fullname" . }}-{{ .Values.secrets.autowizard.secretName }} +{{ include "zammad.fullname" . }}-{{ .Values.secrets.autowizard.secretName }} {{- end -}} {{- end -}} @@ -80,7 +80,7 @@ elasticsearch secret name {{- if .Values.secrets.elasticsearch.useExisting -}} {{ .Values.secrets.elasticsearch.secretName }} {{- else -}} -{{ template "zammad.fullname" . }}-{{ .Values.secrets.elasticsearch.secretName }} +{{ include "zammad.fullname" . }}-{{ .Values.secrets.elasticsearch.secretName }} {{- end -}} {{- end -}} @@ -91,7 +91,7 @@ postgresql secret name {{- if .Values.secrets.postgresql.useExisting -}} {{ .Values.secrets.postgresql.secretName }} {{- else -}} -{{ template "zammad.fullname" . }}-{{ .Values.secrets.postgresql.secretName }} +{{ include "zammad.fullname" . }}-{{ .Values.secrets.postgresql.secretName }} {{- end -}} {{- end -}} @@ -102,7 +102,7 @@ redis secret name {{- if .Values.secrets.redis.useExisting -}} {{ .Values.secrets.redis.secretName }} {{- else -}} -{{ template "zammad.fullname" . }}-{{ .Values.secrets.redis.secretName }} +{{ include "zammad.fullname" . }}-{{ .Values.secrets.redis.secretName }} {{- end -}} {{- end -}} @@ -127,10 +127,10 @@ S3 access URL key: root-password name: {{ .Values.minio.auth.existingSecret }} - name: S3_URL - value: "http://$(MINIO_ROOT_USER):$(MINIO_ROOT_PASSWORD)@{{ template "zammad.fullname" . }}-minio:9000/zammad?region=zammad&force_path_style=true" + value: "http://$(MINIO_ROOT_USER):$(MINIO_ROOT_PASSWORD)@{{ include "zammad.fullname" . }}-minio:9000/zammad?region=zammad&force_path_style=true" {{- else -}} - name: S3_URL - value: "http://{{ .Values.minio.auth.rootUser }}:{{ .Values.minio.auth.rootPassword }}@{{ template "zammad.fullname" . }}-minio:9000/zammad?region=zammad&force_path_style=true" + value: "http://{{ .Values.minio.auth.rootUser }}:{{ .Values.minio.auth.rootPassword }}@{{ include "zammad.fullname" . }}-minio:9000/zammad?region=zammad&force_path_style=true" {{- end -}} {{- end -}} {{- end -}} @@ -144,7 +144,7 @@ environment variables for the Zammad Rails stack - name: REDIS_PASSWORD valueFrom: secretKeyRef: - name: {{ template "zammad.redisSecretName" . }} + name: {{ include "zammad.redisSecretName" . }} key: {{ .Values.secrets.redis.secretKey }} {{- end }} - name: MEMCACHE_SERVERS @@ -156,7 +156,7 @@ environment variables for the Zammad Rails stack - name: POSTGRESQL_PASS valueFrom: secretKeyRef: - name: {{ template "zammad.postgresqlSecretName" . }} + name: {{ include "zammad.postgresqlSecretName" . }} key: {{ .Values.secrets.postgresql.secretKey }} - name: DATABASE_URL value: "postgres://{{ .Values.zammadConfig.postgresql.user }}:$(POSTGRESQL_PASS)@{{ if .Values.zammadConfig.postgresql.enabled }}{{ .Release.Name }}-postgresql{{ else }}{{ .Values.zammadConfig.postgresql.host }}{{ end }}:{{ .Values.zammadConfig.postgresql.port }}/{{ .Values.zammadConfig.postgresql.db }}?{{ .Values.zammadConfig.postgresql.options }}" @@ -185,12 +185,12 @@ environment variable to let Rails fail during startup if migrations are pending volume mounts for the Zammad Rails stack */}} {{- define "zammad.volumeMounts" -}} -- name: {{ template "zammad.fullname" . }}-tmp +- name: {{ include "zammad.fullname" . }}-tmp mountPath: /tmp -- name: {{ template "zammad.fullname" . }}-tmp +- name: {{ include "zammad.fullname" . }}-tmp mountPath: /opt/zammad/tmp {{- if .Values.zammadConfig.storageVolume.enabled }} -- name: {{ template "zammad.fullname" . }}-storage +- name: {{ include "zammad.fullname" . }}-storage mountPath: /opt/zammad/storage {{- end -}} {{- if .Values.autoWizard.enabled }} @@ -207,7 +207,7 @@ volumes for the Zammad Rails stack {{- toYaml .Values.zammadConfig.tmpDirVolume | nindent 2 }} {{- if .Values.zammadConfig.storageVolume.enabled }} {{- if .Values.zammadConfig.storageVolume.existingClaim }} -- name: {{ template "zammad.fullname" . }}-storage +- name: {{ include "zammad.fullname" . }}-storage persistentVolumeClaim: claimName: {{ .Values.zammadConfig.storageVolume.existingClaim | default (include "zammad.fullname" .) }} {{- else }} @@ -217,7 +217,7 @@ volumes for the Zammad Rails stack {{- if .Values.autoWizard.enabled }} - name: autowizard secret: - secretName: {{ template "zammad.autowizardSecretName" . }} + secretName: {{ include "zammad.autowizardSecretName" . }} items: - key: {{ .Values.secrets.autowizard.secretKey }} path: auto_wizard.json diff --git a/zammad/templates/configmap-init.yaml b/zammad/templates/configmap-init.yaml index ca651868..a9b2c3d3 100644 --- a/zammad/templates/configmap-init.yaml +++ b/zammad/templates/configmap-init.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: ConfigMap metadata: - name: {{ template "zammad.fullname" . }}-init + name: {{ include "zammad.fullname" . }}-init labels: {{- include "zammad.labels" . | nindent 4 }} data: diff --git a/zammad/templates/configmap-nginx.yaml b/zammad/templates/configmap-nginx.yaml index 29e3edf2..c8cff24a 100644 --- a/zammad/templates/configmap-nginx.yaml +++ b/zammad/templates/configmap-nginx.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: ConfigMap metadata: - name: {{ template "zammad.fullname" . }}-nginx + name: {{ include "zammad.fullname" . }}-nginx labels: {{- include "zammad.labels" . | nindent 4 }} data: @@ -13,11 +13,11 @@ data: server_tokens off; upstream zammad-railsserver { - server {{ template "zammad.fullname" . }}-railsserver:3000; + server {{ include "zammad.fullname" . }}-railsserver:3000; } upstream zammad-websocket { - server {{ template "zammad.fullname" . }}-websocket:6042; + server {{ include "zammad.fullname" . }}-websocket:6042; } server { diff --git a/zammad/templates/deployment-nginx.yaml b/zammad/templates/deployment-nginx.yaml index 7cba7f5a..081dd3b7 100644 --- a/zammad/templates/deployment-nginx.yaml +++ b/zammad/templates/deployment-nginx.yaml @@ -1,7 +1,7 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: {{ template "zammad.fullname" . }}-nginx + name: {{ include "zammad.fullname" . }}-nginx labels: {{- include "zammad.labels" . | nindent 4 }} app.kubernetes.io/component: zammad-nginx @@ -25,7 +25,7 @@ spec: {{- with .Values.zammadConfig.nginx.sidecars }} {{- toYaml . | nindent 8}} {{- end }} - - name: {{ .Chart.Name }}-nginx + - name: zammad-nginx {{- include "zammad.containerSpec" (merge (dict "containerConfig" .Values.zammadConfig.nginx) .) | nindent 10 }} command: - /usr/sbin/nginx @@ -51,10 +51,10 @@ spec: mountPath: /var/log/nginx volumes: {{- include "zammad.volumes" . | nindent 8 }} - - name: {{ template "zammad.fullname" . }}-init + - name: {{ include "zammad.fullname" . }}-init configMap: - name: {{ template "zammad.fullname" . }}-init + name: {{ include "zammad.fullname" . }}-init defaultMode: 0755 - - name: {{ template "zammad.fullname" . }}-nginx + - name: {{ include "zammad.fullname" . }}-nginx configMap: - name: {{ template "zammad.fullname" . }}-nginx + name: {{ include "zammad.fullname" . }}-nginx diff --git a/zammad/templates/deployment-railsserver.yaml b/zammad/templates/deployment-railsserver.yaml index 11fa55a8..7548719d 100644 --- a/zammad/templates/deployment-railsserver.yaml +++ b/zammad/templates/deployment-railsserver.yaml @@ -1,7 +1,7 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: {{ template "zammad.fullname" . }}-railsserver + name: {{ include "zammad.fullname" . }}-railsserver labels: {{- include "zammad.labels" . | nindent 4 }} app.kubernetes.io/component: zammad-railsserver @@ -25,7 +25,7 @@ spec: {{- with .Values.zammadConfig.railsserver.sidecars }} {{- toYaml . | nindent 8}} {{- end }} - - name: {{ .Chart.Name }}-railsserver + - name: zammad-railsserver {{- include "zammad.containerSpec" (merge (dict "containerConfig" .Values.zammadConfig.railsserver) .) | nindent 10 }} command: - "bundle" diff --git a/zammad/templates/deployment-scheduler.yaml b/zammad/templates/deployment-scheduler.yaml index 7bc6dfeb..5b320ab0 100644 --- a/zammad/templates/deployment-scheduler.yaml +++ b/zammad/templates/deployment-scheduler.yaml @@ -1,7 +1,7 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: {{ template "zammad.fullname" . }}-scheduler + name: {{ include "zammad.fullname" . }}-scheduler labels: {{- include "zammad.labels" . | nindent 4 }} app.kubernetes.io/component: zammad-scheduler @@ -25,7 +25,7 @@ spec: {{- with .Values.zammadConfig.scheduler.sidecars }} {{- toYaml . | nindent 8}} {{- end }} - - name: {{ .Chart.Name }}-scheduler + - name: zammad-scheduler {{- include "zammad.containerSpec" (merge (dict "containerConfig" .Values.zammadConfig.scheduler) .) | nindent 10 }} command: - "bundle" diff --git a/zammad/templates/deployment-websocket.yaml b/zammad/templates/deployment-websocket.yaml index deb53636..f2f89b53 100644 --- a/zammad/templates/deployment-websocket.yaml +++ b/zammad/templates/deployment-websocket.yaml @@ -1,7 +1,7 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: {{ template "zammad.fullname" . }}-websocket + name: {{ include "zammad.fullname" . }}-websocket labels: {{- include "zammad.labels" . | nindent 4 }} app.kubernetes.io/component: zammad-websocket @@ -25,7 +25,7 @@ spec: {{- with .Values.zammadConfig.websocket.sidecars }} {{- toYaml . | nindent 8}} {{- end }} - - name: {{ .Chart.Name }}-websocket + - name: zammad-websocket {{- include "zammad.containerSpec" (merge (dict "containerConfig" .Values.zammadConfig.websocket) .) | nindent 10 }} command: - "bundle" diff --git a/zammad/templates/ingress.yaml b/zammad/templates/ingress.yaml index 6c015c85..314861db 100644 --- a/zammad/templates/ingress.yaml +++ b/zammad/templates/ingress.yaml @@ -49,11 +49,11 @@ spec: backend: {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} service: - name: zammad-nginx + name: {{ $fullName}}-nginx port: number: {{ $svcPort }} {{- else }} - serviceName: zammad-nginx + serviceName: {{ $fullName}}-nginx servicePort: {{ $svcPort }} {{- end }} {{- end }} diff --git a/zammad/templates/job-init.yaml b/zammad/templates/job-init.yaml index 006b324b..636e4666 100644 --- a/zammad/templates/job-init.yaml +++ b/zammad/templates/job-init.yaml @@ -1,7 +1,7 @@ apiVersion: batch/v1 kind: Job metadata: - name: {{ template "zammad.fullname" . }}-init-{{ uuidv4 }} + name: {{ include "zammad.fullname" . }}-init-{{ uuidv4 }} # Use a different job name on each run to ensure a new job always runs once. # 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, @@ -48,7 +48,7 @@ spec: {{- include "zammad.env" . | nindent 12 }} volumeMounts: {{- include "zammad.volumeMounts" . | nindent 12 }} - - name: {{ template "zammad.fullname" . }}-init + - name: {{ include "zammad.fullname" . }}-init mountPath: /docker-entrypoint.sh readOnly: true subPath: postgresql-init @@ -60,7 +60,7 @@ spec: {{- include "zammad.env.failOnPendingMigrations" . | nindent 12 }} volumeMounts: {{- include "zammad.volumeMounts" . | nindent 12 }} - - name: {{ template "zammad.fullname" . }}-init + - name: {{ include "zammad.fullname" . }}-init mountPath: /docker-entrypoint.sh readOnly: true subPath: zammad-init @@ -75,19 +75,19 @@ spec: - name: ELASTICSEARCH_PASSWORD valueFrom: secretKeyRef: - name: {{ template "zammad.elasticsearchSecretName" . }} + name: {{ include "zammad.elasticsearchSecretName" . }} key: {{ .Values.secrets.elasticsearch.secretKey }} {{- end }} volumeMounts: {{- include "zammad.volumeMounts" . | nindent 12 }} - - name: {{ template "zammad.fullname" . }}-init + - name: {{ include "zammad.fullname" . }}-init mountPath: /docker-entrypoint.sh readOnly: true subPath: elasticsearch-init {{- end }} volumes: {{- include "zammad.volumes" . | nindent 8 }} - - name: {{ template "zammad.fullname" . }}-init + - name: {{ include "zammad.fullname" . }}-init configMap: - name: {{ template "zammad.fullname" . }}-init + name: {{ include "zammad.fullname" . }}-init defaultMode: 0755 \ No newline at end of file diff --git a/zammad/templates/secrets.yaml b/zammad/templates/secrets.yaml index 26e97be7..7441031b 100644 --- a/zammad/templates/secrets.yaml +++ b/zammad/templates/secrets.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Secret metadata: - name: {{ template "zammad.autowizardSecretName" . }} + name: {{ include "zammad.autowizardSecretName" . }} labels: {{- include "zammad.labels" . | nindent 4 }} type: Opaque @@ -14,7 +14,7 @@ data: apiVersion: v1 kind: Secret metadata: - name: {{ template "zammad.elasticsearchSecretName" . }} + name: {{ include "zammad.elasticsearchSecretName" . }} labels: {{- include "zammad.labels" . | nindent 4 }} type: Opaque @@ -26,7 +26,7 @@ data: apiVersion: v1 kind: Secret metadata: - name: {{ template "zammad.postgresqlSecretName" . }} + name: {{ include "zammad.postgresqlSecretName" . }} labels: {{- include "zammad.labels" . | nindent 4 }} type: Opaque @@ -38,7 +38,7 @@ data: apiVersion: v1 kind: Secret metadata: - name: {{ template "zammad.redisSecretName" . }} + name: {{ include "zammad.redisSecretName" . }} labels: {{- include "zammad.labels" . | nindent 4 }} type: Opaque