neutron: Fix issue with empty etcSources

Change-Id: Ic62130e626abcbaa0708ad1914c7ee1c038a5e49 Signed-off-by: Mathieu Gagné <mgagne@calavera.ca>
2026-02-19 12:35:47 -05:00
parent de768d35e6
commit 48b73c22c8
16 changed files with 50 additions and 16 deletions
--- 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
--- 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:
--- 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:
--- 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 }}
--- 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:
--- 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:
--- 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:
--- 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 }}
-
--- 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:
--- 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:
--- 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:
--- 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:
--- 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 }}
--- 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
--- 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
--- a/releasenotes/notes/neutron-00a56405067b123d.yaml
+++ 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.
+...