diff --git a/neutron/templates/daemonset-ovn-metadata-agent.yaml b/neutron/templates/daemonset-ovn-metadata-agent.yaml index b1e99153f9..a5ba157511 100644 --- a/neutron/templates/daemonset-ovn-metadata-agent.yaml +++ b/neutron/templates/daemonset-ovn-metadata-agent.yaml @@ -99,7 +99,7 @@ spec: {{ tuple $envAll "pod_dependency" $mounts_neutron_ovn_metadata_agent_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} - name: neutron-metadata-agent-init {{ tuple $envAll "neutron_metadata" | include "helm-toolkit.snippets.image" | indent 10 }} -{{ tuple $envAll $envAll.Values.pod.resources.agent.metadata | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} +{{ tuple $envAll $envAll.Values.pod.resources.agent.ovn_metadata | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} {{ dict "envAll" $envAll "application" "neutron_metadata_agent" "container" "neutron_metadata_agent_init" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }} env: - name: NEUTRON_USER_UID @@ -126,7 +126,7 @@ spec: mountPath: /var/lib/neutron/openstack-helm - name: ovn-neutron-init {{ tuple $envAll "neutron_metadata" | include "helm-toolkit.snippets.image" | indent 10 }} -{{ tuple $envAll $envAll.Values.pod.resources.agent.metadata | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} +{{ tuple $envAll $envAll.Values.pod.resources.agent.ovn_metadata | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} {{ dict "envAll" $envAll "application" "neutron_metadata_agent" "container" "neutron_metadata_agent_init" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }} command: - /tmp/neutron-ovn-init.sh diff --git a/releasenotes/notes/neutron-c451a4129f97e891.yaml b/releasenotes/notes/neutron-c451a4129f97e891.yaml new file mode 100644 index 0000000000..f51082a32d --- /dev/null +++ b/releasenotes/notes/neutron-c451a4129f97e891.yaml @@ -0,0 +1,6 @@ +--- +fixes: + - | + Fixed OVN metadata agent DaemonSet resource configuration inconsistency. + All containers now consistently reference pod.resources.agent.ovn_metadata. +...