diff --git a/neutron/templates/cron-job-ovn-db-sync.yaml b/neutron/templates/cron-job-ovn-db-sync.yaml index ad3e3d63eb..fbe21231c3 100644 --- a/neutron/templates/cron-job-ovn-db-sync.yaml +++ b/neutron/templates/cron-job-ovn-db-sync.yaml @@ -176,11 +176,13 @@ spec: secret: secretName: neutron-etc defaultMode: 0444 -{{- if $etcSources }} - name: neutron-etc-snippets +{{- if $etcSources }} projected: sources: {{ toYaml $etcSources | indent 18 }} +{{- else }} + emptyDir: {} {{ end }} {{- if ( has "tungstenfabric" .Values.network.backend ) }} - name: neutron-plugin-shared diff --git a/neutron/templates/daemonset-bgp-dragent.yaml b/neutron/templates/daemonset-bgp-dragent.yaml index 8db3af06d0..aabfe9f718 100644 --- a/neutron/templates/daemonset-bgp-dragent.yaml +++ b/neutron/templates/daemonset-bgp-dragent.yaml @@ -153,11 +153,13 @@ spec: secret: secretName: {{ $configMapName }} defaultMode: 0444 -{{- if $etcSources }} - name: neutron-etc-snippets +{{- if $etcSources }} projected: sources: {{ toYaml $etcSources | indent 14 }} +{{- else }} + emptyDir: {} {{ end }} - name: libmodules hostPath: diff --git a/neutron/templates/daemonset-dhcp-agent.yaml b/neutron/templates/daemonset-dhcp-agent.yaml index 27d2ed0e25..8c55068c29 100644 --- a/neutron/templates/daemonset-dhcp-agent.yaml +++ b/neutron/templates/daemonset-dhcp-agent.yaml @@ -289,11 +289,13 @@ spec: secret: secretName: {{ $configMapName }} defaultMode: 0444 -{{- if $etcSources }} - name: neutron-etc-snippets +{{- if $etcSources }} projected: sources: {{ toYaml $etcSources | indent 14 }} +{{- else }} + emptyDir: {} {{ end }} - name: iptables-lockfile hostPath: diff --git a/neutron/templates/daemonset-l2gw-agent.yaml b/neutron/templates/daemonset-l2gw-agent.yaml index 88233bb663..46ec045b3c 100644 --- a/neutron/templates/daemonset-l2gw-agent.yaml +++ b/neutron/templates/daemonset-l2gw-agent.yaml @@ -160,11 +160,13 @@ spec: secret: secretName: {{ $configMapName }} defaultMode: 0444 -{{- if $etcSources }} - name: neutron-etc-snippets +{{- if $etcSources }} projected: sources: {{ toYaml $etcSources | indent 14 }} +{{- else }} + emptyDir: {} {{ end }} {{- dict "enabled" $envAll.Values.manifests.certificates "name" $envAll.Values.endpoints.oslo_messaging.auth.admin.secret.tls.internal | include "helm-toolkit.snippets.tls_volume" | indent 8 }} {{ if $mounts_neutron_l2gw_agent.volumes }}{{ toYaml $mounts_neutron_l2gw_agent.volumes | indent 8 }}{{ end }} diff --git a/neutron/templates/daemonset-l3-agent.yaml b/neutron/templates/daemonset-l3-agent.yaml index ff15b15b2d..f0e99b8593 100644 --- a/neutron/templates/daemonset-l3-agent.yaml +++ b/neutron/templates/daemonset-l3-agent.yaml @@ -272,11 +272,13 @@ spec: secret: secretName: {{ $configMapName }} defaultMode: 0444 -{{- if $etcSources }} - name: neutron-etc-snippets +{{- if $etcSources }} projected: sources: {{ toYaml $etcSources | indent 14 }} +{{- else }} + emptyDir: {} {{ end }} - name: libmodules hostPath: diff --git a/neutron/templates/daemonset-lb-agent.yaml b/neutron/templates/daemonset-lb-agent.yaml index 9e6202b5bd..510da39cf4 100644 --- a/neutron/templates/daemonset-lb-agent.yaml +++ b/neutron/templates/daemonset-lb-agent.yaml @@ -228,11 +228,13 @@ spec: secret: secretName: {{ $configMapName }} defaultMode: 0444 -{{- if $etcSources }} - name: neutron-etc-snippets +{{- if $etcSources }} projected: sources: {{ toYaml $etcSources | indent 14 }} +{{- else }} + emptyDir: {} {{ end }} - name: run hostPath: diff --git a/neutron/templates/daemonset-metadata-agent.yaml b/neutron/templates/daemonset-metadata-agent.yaml index 1fad23c232..95dd4516cf 100644 --- a/neutron/templates/daemonset-metadata-agent.yaml +++ b/neutron/templates/daemonset-metadata-agent.yaml @@ -221,11 +221,13 @@ spec: secret: secretName: {{ $configMapName }} defaultMode: 0444 -{{- if $etcSources }} - name: neutron-etc-snippets +{{- if $etcSources }} projected: sources: {{ toYaml $etcSources | indent 14 }} +{{- else }} + emptyDir: {} {{ end }} - name: socket hostPath: diff --git a/neutron/templates/daemonset-netns-cleanup-cron.yaml b/neutron/templates/daemonset-netns-cleanup-cron.yaml index 674f6db545..83ac6b9224 100644 --- a/neutron/templates/daemonset-netns-cleanup-cron.yaml +++ b/neutron/templates/daemonset-netns-cleanup-cron.yaml @@ -155,11 +155,13 @@ spec: secret: secretName: {{ $configMapName }} defaultMode: 0444 -{{- if $etcSources }} - name: neutron-etc-snippets +{{- if $etcSources }} projected: sources: {{ toYaml $etcSources | indent 14 }} +{{- else }} + emptyDir: {} {{ end }} - name: libmodules hostPath: @@ -192,4 +194,3 @@ spec: {{- $configmap_yaml := "neutron.configmap.etc" }} {{- list $daemonset $daemonset_yaml $configmap_yaml $configMapName . | include "helm-toolkit.utils.daemonset_overrides" }} {{- end }} - diff --git a/neutron/templates/daemonset-neutron-ovn-vpn-agent.yaml b/neutron/templates/daemonset-neutron-ovn-vpn-agent.yaml index 4e79395bab..a986e84daf 100644 --- a/neutron/templates/daemonset-neutron-ovn-vpn-agent.yaml +++ b/neutron/templates/daemonset-neutron-ovn-vpn-agent.yaml @@ -245,11 +245,13 @@ spec: secret: secretName: {{ $configMapName }} defaultMode: 0444 -{{- if $etcSources }} - name: neutron-etc-snippets +{{- if $etcSources }} projected: sources: {{ toYaml $etcSources | indent 14 }} +{{- else }} + emptyDir: {} {{ end }} - name: socket hostPath: diff --git a/neutron/templates/daemonset-ovn-metadata-agent.yaml b/neutron/templates/daemonset-ovn-metadata-agent.yaml index a5ba157511..ae75f1250e 100644 --- a/neutron/templates/daemonset-ovn-metadata-agent.yaml +++ b/neutron/templates/daemonset-ovn-metadata-agent.yaml @@ -241,11 +241,13 @@ spec: secret: secretName: {{ $configMapName }} defaultMode: 0444 -{{- if $etcSources }} - name: neutron-etc-snippets +{{- if $etcSources }} projected: sources: {{ toYaml $etcSources | indent 14 }} +{{- else }} + emptyDir: {} {{ end }} - name: socket hostPath: diff --git a/neutron/templates/daemonset-ovs-agent.yaml b/neutron/templates/daemonset-ovs-agent.yaml index 28be6db98c..a7ba9acd5f 100644 --- a/neutron/templates/daemonset-ovs-agent.yaml +++ b/neutron/templates/daemonset-ovs-agent.yaml @@ -310,11 +310,13 @@ spec: secret: secretName: {{ $configMapName }} defaultMode: 0444 -{{- if $etcSources }} - name: neutron-etc-snippets +{{- if $etcSources }} projected: sources: {{ toYaml $etcSources | indent 14 }} +{{- else }} + emptyDir: {} {{ end }} - name: run hostPath: diff --git a/neutron/templates/daemonset-sriov-agent.yaml b/neutron/templates/daemonset-sriov-agent.yaml index ccb7c8bc8a..119352ac21 100644 --- a/neutron/templates/daemonset-sriov-agent.yaml +++ b/neutron/templates/daemonset-sriov-agent.yaml @@ -248,11 +248,13 @@ spec: secret: secretName: {{ $configMapName }} defaultMode: 0444 -{{- if $etcSources }} - name: neutron-etc-snippets +{{- if $etcSources }} projected: sources: {{ toYaml $etcSources | indent 14 }} +{{- else }} + emptyDir: {} {{ end }} - name: run hostPath: diff --git a/neutron/templates/deployment-ironic-agent.yaml b/neutron/templates/deployment-ironic-agent.yaml index 0a43cb7668..133010cf88 100644 --- a/neutron/templates/deployment-ironic-agent.yaml +++ b/neutron/templates/deployment-ironic-agent.yaml @@ -138,11 +138,13 @@ spec: secret: secretName: neutron-etc defaultMode: 0444 -{{- if $etcSources }} - name: neutron-etc-snippets +{{- if $etcSources }} projected: sources: {{ toYaml $etcSources | indent 14 }} +{{- else }} + emptyDir: {} {{ end }} {{- dict "enabled" $envAll.Values.manifests.certificates "name" $envAll.Values.endpoints.oslo_messaging.auth.admin.secret.tls.internal | include "helm-toolkit.snippets.tls_volume" | indent 8 }} {{ if $mounts_neutron_ironic_agent.volumes }}{{ toYaml $mounts_neutron_ironic_agent.volumes | indent 8 }}{{ end }} diff --git a/neutron/templates/deployment-rpc_server.yaml b/neutron/templates/deployment-rpc_server.yaml index 3b3473a700..7c75dc8fe9 100644 --- a/neutron/templates/deployment-rpc_server.yaml +++ b/neutron/templates/deployment-rpc_server.yaml @@ -225,11 +225,13 @@ spec: secret: secretName: neutron-etc defaultMode: 0444 -{{- if $etcSources }} - name: neutron-etc-snippets +{{- if $etcSources }} projected: sources: {{ toYaml $etcSources | indent 14 }} +{{- else }} + emptyDir: {} {{ end }} {{- if ( has "tungstenfabric" .Values.network.backend ) }} - name: neutron-plugin-shared diff --git a/neutron/templates/deployment-server.yaml b/neutron/templates/deployment-server.yaml index d0a26f694a..ce8f492a7d 100644 --- a/neutron/templates/deployment-server.yaml +++ b/neutron/templates/deployment-server.yaml @@ -321,11 +321,13 @@ spec: secret: secretName: neutron-etc defaultMode: 0444 -{{- if $etcSources }} - name: neutron-etc-snippets +{{- if $etcSources }} projected: sources: {{ toYaml $etcSources | indent 14 }} +{{- else }} + emptyDir: {} {{ end }} {{- if ( has "tungstenfabric" .Values.network.backend ) }} - name: neutron-plugin-shared diff --git a/releasenotes/notes/neutron-00a56405067b123d.yaml b/releasenotes/notes/neutron-00a56405067b123d.yaml new file mode 100644 index 0000000000..f496817287 --- /dev/null +++ b/releasenotes/notes/neutron-00a56405067b123d.yaml @@ -0,0 +1,5 @@ +--- +neutron: + - | + Fix issue with etcSources where resources fails to apply if the list is empty. +...