| From 1df9feeb330507bc2f988951e2b4813408621cb3 Mon Sep 17 00:00:00 2001 |
| From: Dong Ma <dong.ma@vexxhost.com> |
| Date: Thu, 13 Feb 2025 16:15:52 +0000 |
| Subject: [PATCH] Fix the missing {priority,runtime}ClassName |
| |
| diff --git a/heat/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl b/heat/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl |
| index 6b77004f..da3c4819 100644 |
| --- a/heat/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl |
| +++ b/heat/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl |
| @@ -70,6 +70,12 @@ spec: |
| annotations: |
| {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }} |
| spec: |
| +{{- if and $envAll.Values.pod.priorityClassName $envAll.Values.pod.priorityClassName.bootstrap }} |
| + priorityClassName: {{ $envAll.Values.pod.priorityClassName.bootstrap }} |
| +{{- end }} |
| +{{- if and $envAll.Values.pod.runtimeClassName $envAll.Values.pod.runtimeClassName.bootstrap }} |
| + runtimeClassName: {{ $envAll.Values.pod.runtimeClassName.bootstrap }} |
| +{{- end }} |
| serviceAccountName: {{ $serviceAccountName }} |
| restartPolicy: OnFailure |
| {{ tuple $envAll "bootstrap" | include "helm-toolkit.snippets.kubernetes_image_pull_secrets" | indent 6 }} |
| diff --git a/heat/templates/job-trusts.yaml b/heat/templates/job-trusts.yaml |
| index ae5bc644..e539e7f9 100644 |
| --- a/heat/templates/job-trusts.yaml |
| +++ b/heat/templates/job-trusts.yaml |
| @@ -43,6 +43,12 @@ spec: |
| configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }} |
| {{ dict "envAll" $envAll "podName" "heat-trusts" "containerNames" (list "heat-trusts" "init" ) | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }} |
| spec: |
| +{{- if and $envAll.Values.pod.priorityClassName $envAll.Values.pod.priorityClassName.heat_trusts }} |
| + priorityClassName: {{ $envAll.Values.pod.priorityClassName.heat_trusts }} |
| +{{- end }} |
| +{{- if and $envAll.Values.pod.runtimeClassName $envAll.Values.pod.runtimeClassName.heat_trusts }} |
| + runtimeClassName: {{ $envAll.Values.pod.runtimeClassName.heat_trusts }} |
| +{{- end }} |
| serviceAccountName: {{ $serviceAccountName }} |
| {{ dict "envAll" $envAll "application" "trusts" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }} |
| restartPolicy: OnFailure |
| diff --git a/heat/values.yaml b/heat/values.yaml |
| index af99c49c..e242d7d3 100644 |
| --- a/heat/values.yaml |
| +++ b/heat/values.yaml |
| @@ -1023,6 +1023,8 @@ pod: |
| heat_engine_cleaner: null |
| heat_purge_deleted: null |
| heat_engine: null |
| + heat_trusts: null |
| + bootstrap: null |
| db_sync: null |
| runtimeClassName: |
| heat_api: null |
| @@ -1032,6 +1034,8 @@ pod: |
| heat_engine_cleaner: null |
| heat_purge_deleted: null |
| heat_engine: null |
| + heat_trusts: null |
| + bootstrap: null |
| db_sync: null |
| security_context: |
| heat: |