From 06508940994ce8a85c7990d9f3285008fdb706e4 Mon Sep 17 00:00:00 2001
From: Saeed Padari <sam137115@gmail.com>
Date: Fri, 17 Oct 2025 20:44:42 +0330
Subject: [PATCH] Add support for optional node selector labels for kube-ovn
 OVS/OVN pods

This change introduces a new Helm value ovsNodesLabels that allows
adding custom node selector labels to ovs-ovn pods. For example:
 ovsNodesLabels:
  kube-ovn/role: ovs
This is useful in environments such as OpenStack-Helm, where operators
may want to schedule OVS/OVN pods only on specific nodes (e.g., compute
nodes) instead of deploying them cluster-wide. When ovsNodesLabels is
empty, only the default selector kubernetes.io/os: linux is applied.

Signed-off-by: Saeed Padari <sam137115@gmail.com>
---
 charts/kube-ovn-v2/templates/agent/agent-daemonset.yaml    | 3 +++
 .../kube-ovn-v2/templates/ovs-ovn/ovs-ovn-daemonset.yaml   | 3 +++
 charts/kube-ovn-v2/templates/pinger/pinger-daemonset.yaml  | 3 +++
 charts/kube-ovn-v2/values.yaml                             | 7 +++++++
 4 files changed, 16 insertions(+)

diff --git a/charts/kube-ovn-v2/templates/agent/agent-daemonset.yaml b/charts/kube-ovn-v2/templates/agent/agent-daemonset.yaml
index 41d100de11a..2c1e699a33c 100644
--- a/charts/kube-ovn-v2/templates/agent/agent-daemonset.yaml
+++ b/charts/kube-ovn-v2/templates/agent/agent-daemonset.yaml
@@ -231,6 +231,9 @@ spec:
         {{- end }}
       nodeSelector:
         kubernetes.io/os: "linux"
+        {{- with .Values.ovsNodesLabels }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
       volumes:
         - name: usr-local-sbin
           emptyDir: {}
diff --git a/charts/kube-ovn-v2/templates/ovs-ovn/ovs-ovn-daemonset.yaml b/charts/kube-ovn-v2/templates/ovs-ovn/ovs-ovn-daemonset.yaml
index 6fc51967ca9..8bdc24a634a 100644
--- a/charts/kube-ovn-v2/templates/ovs-ovn/ovs-ovn-daemonset.yaml
+++ b/charts/kube-ovn-v2/templates/ovs-ovn/ovs-ovn-daemonset.yaml
@@ -180,6 +180,9 @@ spec:
           {{- end }}
       nodeSelector:
         kubernetes.io/os: "linux"
+        {{- with .Values.ovsNodesLabels }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
       volumes:
         - name: usr-local-sbin
           emptyDir: {}
diff --git a/charts/kube-ovn-v2/templates/pinger/pinger-daemonset.yaml b/charts/kube-ovn-v2/templates/pinger/pinger-daemonset.yaml
index b17b1f43904..ba83ba72ccd 100644
--- a/charts/kube-ovn-v2/templates/pinger/pinger-daemonset.yaml
+++ b/charts/kube-ovn-v2/templates/pinger/pinger-daemonset.yaml
@@ -156,6 +156,9 @@ spec:
             periodSeconds: 10
       nodeSelector:
         kubernetes.io/os: "linux"
+        {{- with .Values.ovsNodesLabels }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
       volumes:
         - name: host-run-ovs
           hostPath:
diff --git a/charts/kube-ovn-v2/values.yaml b/charts/kube-ovn-v2/values.yaml
index fa7d6719e66..76505ac9e65 100644
--- a/charts/kube-ovn-v2/values.yaml
+++ b/charts/kube-ovn-v2/values.yaml
@@ -47,6 +47,13 @@ masterNodesLabels:
   kube-ovn/role: master
   # node-role.kubernetes.io/control-plane: ""
 
+# -- Additional node selector labels for the OVS/OVN pods.
+# This allows scheduling pods like ovs-ovn, kube-ovn-cni, and kube-ovn-pinger on specific nodes.
+# See https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector
+# @section -- Global parameters
+ovsNodesLabels: {}
+  # kube-ovn/role: ovs
+
 # -- General configuration of the network created by Kube-OVN.
 # @section -- Network parameters of the CNI
 # @default -- "{}"