Merge pull request #415 from galaxyproject/interesting-wolverine

Use pod priority class for jobs
galaxyproject · Mar 7, 2023 · 1bc44b9 · 1bc44b9
2 parents 1ff9142 + 5096117
commit 1bc44b9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/galaxy/templates/_helpers.tpl b/galaxy/templates/_helpers.tpl
@@ -262,7 +262,7 @@ Define pod priority class
 */}}
 {{- define "galaxy.pod-priority-class" -}}
 {{- if .Values.jobs.priorityClass.existingClass -}}
-{{- printf "%s" .Values.jobs.priorityClass.existingClass -}}
+{{- tpl .Values.jobs.priorityClass.existingClass . -}}
 {{- else -}}
 {{- printf "%s-job-priority" (include "galaxy.fullname" .) -}}
 {{- end -}}

diff --git a/galaxy/values.yaml b/galaxy/values.yaml
@@ -363,7 +363,7 @@ configs:
         k8s_job_ttl_secs_after_finished: 90
         k8s_pod_priority_class: >-
           {{ if .Values.jobs.priorityClass.enabled -}}
-          {{- include "galaxy.fullname" . }}-job-priority
+            {{- include "galaxy.pod-priority-class" . }}
           {{- end }}
         k8s_interactivetools_use_ssl: true
         k8s_interactivetools_ingress_annotations: |