starlingx/openstack-armada-app
Code Issues Proposed changes

Revert "Remove unused default Agents Daemonset"

Browse Source 
This reverts commit 32b671624f00f14a876b99e68e4a5d79e761255f.

Reason for revert: Reverting this form main branch to smooth the f/caracal merge-back process later. For now, this will be merged directly into f/caracal - https://review.opendev.org/c/starlingx/openstack-armada-app/+/940909

Change-Id: I2da3a04dc861b2a1e4852ad25199a34a447792b9
This commit is contained in:
Thales Elero Cervi 2025-02-06 21:05:05 +00:00 committed by Gerrit Code Review
parent 32b671624f
commit 26c19fd2b2
3 changed files with 1 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
openstack-helm-infra/debian/deb_folder/patches/0022-removed-section-to-add-default-daemonset-to-global-l.patch
View File

@ -1,27 +0,0 @@
From 45e6c1ad9a4791ad125bd95efc52f03c68a4736a Mon Sep 17 00:00:00 2001
From: kgoncalv <kayo.goncalvesdacosta@windriver.com>
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

1
openstack-helm-infra/debian/deb_folder/patches/series
View File

@ -19,4 +19,3 @@
0019-Add-pre-apply-cleanup-Job-to-STX-O-Helm-charts.patch
0020-Add-Kubernetes-name-label-to-helm-toolkit-template.patch
0021-Add-support-for-multiple-hosts-in-a-daemonset.patch
0022-removed-section-to-add-default-daemonset-to-global-l.patch

10
stx-openstack-helm-fluxcd/stx-openstack-helm-fluxcd/manifests/neutron/neutron-static-overrides.yaml
View File

@ -1,5 +1,5 @@
#
# Copyright (c) 2023-2025 Wind River Systems, Inc.
# Copyright (c) 2023-2024 Wind River Systems, Inc.
#
# SPDX-License-Identifier: Apache-2.0
#
@ -172,14 +172,6 @@ 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