| 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/ironic/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl b/ironic/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl |
| index 6b77004f..da3c4819 100644 |
| --- a/ironic/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl |
| +++ b/ironic/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/ironic/templates/statefulset-conductor.yaml b/ironic/templates/statefulset-conductor.yaml |
| index bcf6238c..fc0031ef 100644 |
| --- a/ironic/templates/statefulset-conductor.yaml |
| +++ b/ironic/templates/statefulset-conductor.yaml |
| @@ -44,6 +44,12 @@ spec: |
| configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }} |
| configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }} |
| spec: |
| +{{ with .Values.pod.priorityClassName.ironic_conductor }} |
| + priorityClassName: {{ . }} |
| +{{ end }} |
| +{{ with .Values.pod.runtimeClassName.ironic_conductor }} |
| + runtimeClassName: {{ . }} |
| +{{ end }} |
| serviceAccountName: {{ $serviceAccountName }} |
| affinity: |
| {{ tuple $envAll "ironic" "conductor" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }} |
| diff --git a/ironic/values.yaml b/ironic/values.yaml |
| index d28463aa..bc4b0349 100644 |
| --- a/ironic/values.yaml |
| +++ b/ironic/values.yaml |
| @@ -107,6 +107,7 @@ conf: |
| api_url: null |
| database: |
| connection: null |
| + max_retries: -1 |
| deploy: |
| http_root: /var/lib/openstack-helm/httpboot |
| glance: |
| @@ -641,9 +642,13 @@ endpoints: |
| pod: |
| priorityClassName: |
| ironic_api: null |
| + ironic_conductor: null |
| + bootstrap: null |
| db_sync: null |
| runtimeClassName: |
| ironic_api: null |
| + ironic_conductor: null |
| + bootstrap: null |
| db_sync: null |
| affinity: |
| anti: |