feat(helm):Add affinity and nodeSelector support for ovs-ovn and ovs-ovn-dpdk DaemonSets using v2 chart (#6308)

* feat: add affinity and nodeSelector support for ovs-ovn and ovs-ovn-dpdk DaemonSets using v2 chart

Signed-off-by: Juan Morete <juan.morete@swisscom.com>

* feat(chart): Add custom affinity and nodeSelector support for ovs-ovn and ovs-ovn-dpdk DaemonSets

Signed-off-by: Juan Morete <juan.morete@swisscom.com>

---------

Signed-off-by: Juan Morete <juan.morete@swisscom.com>

Author: morete

charts/kube-ovn-v2/templates/ovs-ovn/ovs-ovn-daemonset.yaml

@@ -47,6 +47,10 @@ spec:
           operator: Exists
         - key: CriticalAddonsOnly
           operator: Exists
+      {{- with .Values.ovsOvn.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       priorityClassName: system-node-critical
       serviceAccountName: ovn-ovs
       automountServiceAccountToken: true
@@ -188,8 +192,10 @@ spec:
           resources:
             {{- toYaml . | trim | nindent 12 }}
           {{- end }}
+      {{- with .Values.ovsOvn.nodeSelector }}
       nodeSelector:
-        kubernetes.io/os: "linux"
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       volumes:
         - name: usr-local-sbin
           emptyDir: {}

charts/kube-ovn-v2/templates/ovs-ovn/ovs-ovn-dpdk-daemonset.yaml

@@ -43,6 +43,10 @@ spec:
     spec:
       tolerations:
       - operator: Exists
+      {{- with .Values.ovsOvn.dpdkHybrid.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       priorityClassName: system-node-critical
       serviceAccountName: ovn-ovs
       automountServiceAccountToken: true
@@ -132,9 +136,10 @@ spec:
           resources:
             {{- toYaml . | trim | nindent 12 }}
           {{- end }}
+      {{- with .Values.ovsOvn.dpdkHybrid.nodeSelector }}
       nodeSelector:
-        kubernetes.io/os: "linux"
-        ovn.kubernetes.io/ovs_dp_type: "userspace"
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       volumes:
         - name: host-config-ovs
           hostPath:

charts/kube-ovn-v2/values.yaml

@@ -358,6 +358,13 @@ ovsOvn:
   # -- Labels to be added to ovs-ovn pods.
   # @section -- OVS/OVN daemons configuration
   podLabels: {}
+  # -- Affinity for ovs-ovn pods.
+  # @section -- OVS/OVN daemons configuration
+  affinity: {}
+  # -- Node selector to restrict the deployment of ovs-ovn to specific nodes.
+  # @section -- OVS/OVN daemons configuration
+  nodeSelector:
+    kubernetes.io/os: "linux"
 
   # -- Extra environment variables to be added to ovs-ovn pods.
   # @section -- OVS/OVN daemons configuration
@@ -417,6 +424,14 @@ ovsOvn:
     # -- DPDK image tag.
     # @section -- OVS/OVN daemons configuration
     tag: v1.14.32
+    # -- Affinity for the ovs-ovn-dpdk DaemonSet.
+    # @section -- OVS/OVN daemons configuration
+    affinity: {}
+    # -- Node selector to restrict the deployment of DPDK-hybrid OVS to specific nodes.
+    # @section -- OVS/OVN daemons configuration
+    nodeSelector:
+      kubernetes.io/os: "linux"
+      ovn.kubernetes.io/ovs_dp_type: "userspace"
     # -- ovs-ovn resource limits & requests when DPDK-hybrid is enabled.
     # ref: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
     # @section -- OVS/OVN daemons configuration