blob: a2f3d3b4cf090c63cd731ec084756c5b655e250e [file] [log] [blame]
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/neutron/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl b/neutron/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl
index 6b77004f..da3c4819 100644
--- a/neutron/charts/helm-toolkit/templates/manifests/_job-bootstrap.tpl
+++ b/neutron/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/neutron/templates/daemonset-bagpipe-bgp.yaml b/neutron/templates/daemonset-bagpipe-bgp.yaml
index fd4f0930..e2bd90b5 100644
--- a/neutron/templates/daemonset-bagpipe-bgp.yaml
+++ b/neutron/templates/daemonset-bagpipe-bgp.yaml
@@ -57,10 +57,10 @@ spec:
{{ tuple "neutron_bagpipe_bgp" . | include "helm-toolkit.snippets.custom_pod_annotations" | indent 8 }}
spec:
{{ dict "envAll" $envAll "application" "neutron_bagpipe_bgp" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}
-{{ with .Values.pod.priorityClassName.neutron_bagpipe_bgp }}
+{{ with .Values.pod.priorityClassName.bagpipe_bgp }}
priorityClassName: {{ . }}
{{ end }}
-{{ with .Values.pod.runtimeClassName.neutron_bagpipe_bgp }}
+{{ with .Values.pod.runtimeClassName.bagpipe_bgp }}
runtimeClassName: {{ . }}
{{ end }}
serviceAccountName: {{ $serviceAccountName }}
diff --git a/neutron/templates/daemonset-bgp-dragent.yaml b/neutron/templates/daemonset-bgp-dragent.yaml
index caa61391..8a6a3099 100644
--- a/neutron/templates/daemonset-bgp-dragent.yaml
+++ b/neutron/templates/daemonset-bgp-dragent.yaml
@@ -56,10 +56,10 @@ spec:
{{ tuple "neutron_bgp_dragent" . | include "helm-toolkit.snippets.custom_pod_annotations" | indent 8 }}
spec:
{{ dict "envAll" $envAll "application" "neutron_bgp_dragent" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}
-{{ with .Values.pod.priorityClassName.neutron_bgp_dragent }}
+{{ with .Values.pod.priorityClassName.bgp_dragent }}
priorityClassName: {{ . }}
{{ end }}
-{{ with .Values.pod.runtimeClassName.neutron_bgp_dragent }}
+{{ with .Values.pod.runtimeClassName.bgp_dragent }}
runtimeClassName: {{ . }}
{{ end }}
serviceAccountName: {{ $serviceAccountName }}
diff --git a/neutron/values.yaml b/neutron/values.yaml
index dbb4fd00..57cb3b70 100644
--- a/neutron/values.yaml
+++ b/neutron/values.yaml
@@ -390,15 +390,15 @@ dependencies:
pod:
priorityClassName:
- neutron_bagpipe_bgp: null
- neutron_bgp_dragent: null
+ bagpipe_bgp: null
+ bgp_dragent: null
neutron_dhcp_agent: null
neutron_l2gw_agent: null
neutron_l3_agent: null
neutron_lb_agent: null
neutron_metadata_agent: null
neutron_netns_cleanup_cron: null
- neutron_ovn_vpn_agent: null
+ ovn_vpn_agent: null
neutron_ovn_metadata_agent: null
neutron_ovs_agent: null
neutron_sriov_agent: null
@@ -406,17 +406,18 @@ pod:
neutron_rpc_server: null
neutron_server: null
neutron_tests: null
+ bootstrap: null
db_sync: null
runtimeClassName:
- neutron_bagpipe_bgp: null
- neutron_bgp_dragent: null
+ bagpipe_bgp: null
+ bgp_dragent: null
neutron_dhcp_agent: null
neutron_l2gw_agent: null
neutron_l3_agent: null
neutron_lb_agent: null
neutron_metadata_agent: null
neutron_netns_cleanup_cron: null
- neutron_ovn_vpn_agent: null
+ ovn_vpn_agent: null
neutron_ovn_metadata_agent: null
neutron_ovs_agent: null
neutron_sriov_agent: null
@@ -424,6 +425,7 @@ pod:
neutron_rpc_server: null
neutron_server: null
neutron_tests: null
+ bootstrap: null
db_sync: null
sidecars:
neutron_policy_server: false