From 8e5ad85fd09983e07ddc87de76e480b4ceca9120 Mon Sep 17 00:00:00 2001
From: ricolin <rlin@vexxhost.com>
Date: Tue, 8 Oct 2024 21:17:53 +0800
Subject: [PATCH] Add node_selector_key for OVN VPN agent

Also Provide default value for manifests.daemonset_ovn*

Change-Id: I11d461c1b233862af6a6bff78c64543e758fa387
---
 neutron/Chart.yaml                                     | 2 +-
 neutron/templates/daemonset-neutron-ovn-vpn-agent.yaml | 2 +-
 neutron/values.yaml                                    | 5 +++++
 releasenotes/notes/neutron.yaml                        | 1 +
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/neutron/Chart.yaml b/neutron/Chart.yaml
index 740343680d..7fc37d58e1 100644
--- a/neutron/Chart.yaml
+++ b/neutron/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Neutron
 name: neutron
-version: 0.3.48
+version: 0.3.49
 home: https://docs.openstack.org/neutron/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Neutron/OpenStack_Project_Neutron_vertical.png
 sources:
diff --git a/neutron/templates/daemonset-neutron-ovn-vpn-agent.yaml b/neutron/templates/daemonset-neutron-ovn-vpn-agent.yaml
index 0302fae95f..fc6d805556 100644
--- a/neutron/templates/daemonset-neutron-ovn-vpn-agent.yaml
+++ b/neutron/templates/daemonset-neutron-ovn-vpn-agent.yaml
@@ -83,7 +83,7 @@ spec:
 {{ tuple $envAll "neutron" | include "helm-toolkit.snippets.kubernetes_tolerations" | indent 6 }}
 {{ end }}
       nodeSelector:
-        {{ .Values.labels.ovs.node_selector_key }}: {{ .Values.labels.ovs.node_selector_value }}
+        {{ .Values.labels.agent.ovn_vpn.node_selector_key }}: {{ .Values.labels.agent.ovn_vpn.node_selector_value }}
       dnsPolicy: ClusterFirstWithHostNet
       hostNetwork: true
       {{- if or ( gt .Capabilities.KubeVersion.Major "1" ) ( ge .Capabilities.KubeVersion.Minor "10" ) }}
diff --git a/neutron/values.yaml b/neutron/values.yaml
index 399419b22b..99dcd53700 100644
--- a/neutron/values.yaml
+++ b/neutron/values.yaml
@@ -70,6 +70,9 @@ labels:
     l2gw:
       node_selector_key: openstack-control-plane
       node_selector_value: enabled
+    ovn_vpn:
+      node_selector_key: openstack-control-plane
+      node_selector_value: enabled
   job:
     node_selector_key: openstack-control-plane
     node_selector_value: enabled
@@ -2651,6 +2654,8 @@ manifests:
   daemonset_bagpipe_bgp: false
   daemonset_bgp_dragent: false
   daemonset_netns_cleanup_cron: true
+  daemonset_ovn_metadata_agent: false
+  daemonset_ovn_vpn_agent: false
   deployment_ironic_agent: false
   deployment_server: true
   deployment_rpc_server: true
diff --git a/releasenotes/notes/neutron.yaml b/releasenotes/notes/neutron.yaml
index 3f05d5bbae..f426a8fce1 100644
--- a/releasenotes/notes/neutron.yaml
+++ b/releasenotes/notes/neutron.yaml
@@ -90,4 +90,5 @@ neutron:
   - 0.3.46 Use quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal by default
   - 0.3.47 Add service role to the Neutron user
   - 0.3.48 Add 2024.2 Ubuntu Jammy overrides
+  - 0.3.49 Add node_selector_* for OVN VPN agent
 ...