diff --git a/openstack-helm-infra/debian/deb_folder/patches/0020-removed-section-to-add-default-daemonset-to-global-l.patch b/openstack-helm-infra/debian/deb_folder/patches/0020-removed-section-to-add-default-daemonset-to-global-l.patch new file mode 100644 index 00000000..92d8a445 --- /dev/null +++ b/openstack-helm-infra/debian/deb_folder/patches/0020-removed-section-to-add-default-daemonset-to-global-l.patch @@ -0,0 +1,27 @@ +From 45e6c1ad9a4791ad125bd95efc52f03c68a4736a Mon Sep 17 00:00:00 2001 +From: kgoncalv +Date: Mon, 3 Feb 2025 11:02:34 -0300 +Subject: [PATCH] removed section to add default daemonset to global list + +--- + helm-toolkit/templates/utils/_daemonset_overrides.tpl | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/helm-toolkit/templates/utils/_daemonset_overrides.tpl b/helm-toolkit/templates/utils/_daemonset_overrides.tpl +index 5f769753..cce14dd6 100644 +--- a/helm-toolkit/templates/utils/_daemonset_overrides.tpl ++++ b/helm-toolkit/templates/utils/_daemonset_overrides.tpl +@@ -227,10 +227,6 @@ limitations under the License. + {{- $root_conf_copy4 := dict "Values" $root_conf_copy3 }} + {{- $_ := set $context.Values.__default "nodeData" $root_conf_copy4 }} + +- {{/* add to global list */}} +- {{- $list_aggregate := append $context.Values.__daemonset_list $context.Values.__default }} +- {{- $_ := set $context.Values "__daemonset_list" $list_aggregate }} +- + {{- range $current_dict := $context.Values.__daemonset_list }} + + {{- $context_novalues := omit $context "Values" }} +-- +2.34.1 + diff --git a/openstack-helm-infra/debian/deb_folder/patches/series b/openstack-helm-infra/debian/deb_folder/patches/series index 43a87d9d..7aaa1b56 100644 --- a/openstack-helm-infra/debian/deb_folder/patches/series +++ b/openstack-helm-infra/debian/deb_folder/patches/series @@ -17,3 +17,4 @@ 0017-Add-Kubernetes-name-label-to-helm-toolkit-template.patch 0018-Add-support-for-multiple-hosts-in-a-daemonset.patch 0019-Fix-upversion-breaking-changes.patch +0020-removed-section-to-add-default-daemonset-to-global-l.patch diff --git a/stx-openstack-helm-fluxcd/stx-openstack-helm-fluxcd/manifests/neutron/neutron-static-overrides.yaml b/stx-openstack-helm-fluxcd/stx-openstack-helm-fluxcd/manifests/neutron/neutron-static-overrides.yaml index b4205113..ec9a1c9d 100644 --- a/stx-openstack-helm-fluxcd/stx-openstack-helm-fluxcd/manifests/neutron/neutron-static-overrides.yaml +++ b/stx-openstack-helm-fluxcd/stx-openstack-helm-fluxcd/manifests/neutron/neutron-static-overrides.yaml @@ -182,6 +182,14 @@ dependencies: ovs_agent: pod: null conf: + overrides: + neutron_netns-cleanup-cron: + labels: + - conf: {} + label: + key: openstack-control-plane + values: + - enabled neutron: DEFAULT: l3_ha: false