diff --git a/zammad/Chart.yaml b/zammad/Chart.yaml index 8d0dbd1d..96fbf8e0 100755 --- a/zammad/Chart.yaml +++ b/zammad/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: zammad -version: 15.2.5 +version: 15.3.0 appVersion: 6.5.2-22 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/_helpers.tpl b/zammad/templates/_helpers.tpl index 80c4e3a6..46d43f82 100755 --- a/zammad/templates/_helpers.tpl +++ b/zammad/templates/_helpers.tpl @@ -323,6 +323,15 @@ initContainers: {{ include "zammad.podSpec.initContainers" . | nindent 2 }} {{- end -}} +{{/* +priority class configuration for Zammad pods +*/}} +{{- define "zammad.podSpec.priorityClass" -}} +{{- if .priorityClassName }} +priorityClassName: {{ .priorityClassName }} +{{- end}} +{{- end -}} + {{/* shared configuration for Zammad containers */}} diff --git a/zammad/templates/cronjob-reindex.yaml b/zammad/templates/cronjob-reindex.yaml index c2273cb3..1ef6380e 100755 --- a/zammad/templates/cronjob-reindex.yaml +++ b/zammad/templates/cronjob-reindex.yaml @@ -30,6 +30,7 @@ spec: {{- toYaml . | nindent 12}} {{- end }} spec: + {{- include "zammad.podSpec.priorityClass" .Values.zammadConfig.cronJob | nindent 10 }} {{- include "zammad.podSpec" . | nindent 10 }} {{- with .Values.zammadConfig.cronJob.reindex.podSpec }} {{- toYaml . | nindent 10}} diff --git a/zammad/templates/deployment-nginx.yaml b/zammad/templates/deployment-nginx.yaml index aa728cbc..d2db8bed 100644 --- a/zammad/templates/deployment-nginx.yaml +++ b/zammad/templates/deployment-nginx.yaml @@ -28,6 +28,7 @@ spec: {{- toYaml . | nindent 8}} {{- end }} spec: + {{- include "zammad.podSpec.priorityClass" .Values.zammadConfig.nginx | nindent 6 }} {{- include "zammad.podSpec.deployment" . | nindent 6 }} {{- with .Values.zammadConfig.nginx.nodeSelector }} nodeSelector: diff --git a/zammad/templates/deployment-railsserver.yaml b/zammad/templates/deployment-railsserver.yaml index 4818839f..cada4789 100644 --- a/zammad/templates/deployment-railsserver.yaml +++ b/zammad/templates/deployment-railsserver.yaml @@ -27,6 +27,7 @@ spec: {{- toYaml . | nindent 8}} {{- end }} spec: + {{- include "zammad.podSpec.priorityClass" .Values.zammadConfig.railsserver | nindent 6 }} {{- include "zammad.podSpec.deployment" . | nindent 6 }} {{- with .Values.zammadConfig.railsserver.nodeSelector }} nodeSelector: diff --git a/zammad/templates/deployment-scheduler.yaml b/zammad/templates/deployment-scheduler.yaml index 283f87b4..e9947546 100644 --- a/zammad/templates/deployment-scheduler.yaml +++ b/zammad/templates/deployment-scheduler.yaml @@ -31,6 +31,7 @@ spec: {{- toYaml . | nindent 8}} {{- end }} spec: + {{- include "zammad.podSpec.priorityClass" .Values.zammadConfig.scheduler | nindent 6 }} {{- include "zammad.podSpec.deployment" . | nindent 6 }} {{- with .Values.zammadConfig.scheduler.nodeSelector }} nodeSelector: diff --git a/zammad/templates/deployment-websocket.yaml b/zammad/templates/deployment-websocket.yaml index 4844246e..8ab8f0e8 100755 --- a/zammad/templates/deployment-websocket.yaml +++ b/zammad/templates/deployment-websocket.yaml @@ -29,6 +29,7 @@ spec: {{- toYaml . | nindent 8}} {{- end }} spec: + {{- include "zammad.podSpec.priorityClass" .Values.zammadConfig.websocket | nindent 6 }} {{- include "zammad.podSpec.deployment" . | nindent 6 }} {{- with .Values.zammadConfig.websocket.topologySpreadConstraints }} topologySpreadConstraints: diff --git a/zammad/templates/job-init.yaml b/zammad/templates/job-init.yaml index 702008fd..1dd6be72 100755 --- a/zammad/templates/job-init.yaml +++ b/zammad/templates/job-init.yaml @@ -34,6 +34,7 @@ spec: {{- toYaml . | nindent 8}} {{- end }} spec: + {{- include "zammad.podSpec.priorityClass" .Values.zammadConfig.initJob | nindent 6 }} {{- include "zammad.podSpec" . | nindent 6 }} {{- with .Values.zammadConfig.initJob.podSpec }} {{- toYaml . | nindent 6}} diff --git a/zammad/values.yaml b/zammad/values.yaml index 30c5d361..aeaae8f6 100755 --- a/zammad/values.yaml +++ b/zammad/values.yaml @@ -168,6 +168,7 @@ zammadConfig: # labelSelector: # matchLabels: # app.kubernetes.io/name: zammad + priorityClassName: "" postgresql: # enable/disable postgresql chart dependency @@ -257,6 +258,7 @@ zammadConfig: # labelSelector: # matchLabels: # app.kubernetes.io/name: zammad + priorityClassName: "" redis: # enable/disable redis chart dependency @@ -310,6 +312,7 @@ zammadConfig: # labelSelector: # matchLabels: # app.kubernetes.io/name: zammad + priorityClassName: "" storageVolume: # Enable this for 'File' based storage in Zammad. You must provide an externally managed 'extistingClaim' @@ -400,6 +403,7 @@ zammadConfig: # labelSelector: # matchLabels: # app.kubernetes.io/name: zammad + priorityClassName: "" initContainers: elasticsearch: @@ -513,8 +517,11 @@ zammadConfig: # labelSelector: # matchLabels: # app.kubernetes.io/name: zammad + + priorityClassName: "" cronJob: + priorityClassName: "" reindex: # By default, this cronjob never runs. It can be used to create maintenance jobs with # kubectl create job my-reindex-job --from=cronjob/zammad-cronjob-reindex