feat(helm): refactor

Signed-off-by: SkalaNetworks <[email protected]>

Author: SkalaNetworks

charts/kube-ovn/templates/agent/agent-daemonset.yaml

@@ -106,7 +106,7 @@ spec:
           {{- if eq .Values.networking.networkType "vlan" }}
           - --iface=
           {{- else}}
-          - --iface={{- .Values.networking.interface }}
+          - --iface={{- .Values.agent.interface }}
           {{- end }}
           - --service-cluster-ip-range=
           {{- if eq .Values.networking.stack "Dual" -}}
@@ -116,7 +116,7 @@ spec:
           {{- else if eq .Values.networking.stack "IPv6" -}}
           {{ .Values.networking.services.cidr.v6 }}
           {{- end }}
-          - --dpdk-tunnel-iface={{- .Values.networking.dpdkTunnelInterface }}
+          - --dpdk-tunnel-iface={{- .Values.agent.dpdkTunnelInterface }}
           - --network-type={{- .Values.networking.tunnelType }}
           - --default-interface-name={{- .Values.networking.vlan.interfaceName }}
           - --logtostderr=false

charts/kube-ovn/templates/central/central-deployment.yaml

@@ -117,11 +117,11 @@ spec:
             - name: PROBE_INTERVAL
               value: "{{ .Values.ovsOvn.probeInterval }}"
             - name: OVN_NORTHD_PROBE_INTERVAL
-              value: "{{ .Values.ovsOvn.ovnNorthdProbeInterval}}"
+              value: "{{ .Values.central.ovnNorthdProbeInterval}}"
             - name: OVN_LEADER_PROBE_INTERVAL
-              value: "{{ .Values.ovsOvn.ovnLeaderProbeInterval }}"
+              value: "{{ .Values.central.ovnLeaderProbeInterval }}"
             - name: OVN_NORTHD_N_THREADS
-              value: "{{ .Values.ovsOvn.ovnNorthdNThreads }}"
+              value: "{{ .Values.central.ovnNorthdNThreads }}"
             - name: ENABLE_COMPACT
               value: "{{ .Values.networking.enableCompact }}"
             - name: OVN_VERSION_COMPATIBILITY

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

@@ -65,7 +65,7 @@ spec:
             - name: TUNNEL_TYPE
               value: "{{- .Values.networking.tunnelType }}"
             - name: DPDK_TUNNEL_IFACE
-              value: "{{- .Values.networking.dpdkTunnelInterface }}"
+              value: "{{- .Values.agent.dpdkTunnelInterface }}"
             - name: KUBE_NODE_NAME
               valueFrom:
                 fieldRef:

charts/kube-ovn/values.yaml

@@ -84,8 +84,6 @@ networking:
     name: "ovn-vlan"
     id: "100"
 
-  interface: ""
-  dpdkTunnelInterface: "br-phy"
   exchangeLinkName: false
   enableEcmp: false
   enableCompact: false
@@ -218,12 +216,9 @@ ovsOvn:
   # -- Directory on the node where Open Virtual Network (OVN) lives
   ovnDirectory: "/etc/origin/ovn"
 
-  probeInterval: 180000
-  ovnNorthdProbeInterval: 5000
-  ovnLeaderProbeInterval: 5
   ovnRemoteProbeInterval: 10000
   ovnRemoteOpenflowInterval: 180
-  ovnNorthdNThreads: 1
+  probeInterval: 180000
 
   # -- DPDK support for OVS
   # ref: https://kubeovn.github.io/docs/v1.12.x/en/advance/dpdk/
@@ -403,6 +398,10 @@ central:
       cpu: "3"
       memory: "4Gi"
 
+  ovnNorthdProbeInterval: 5000
+  ovnNorthdNThreads: 1
+  ovnLeaderProbeInterval: 5
+
 # -- Configuration for kube-ovn-cni, the agent responsible for handling CNI requests from the CRI
 agent:
   # -- Annotations to be added to all top-level agent objects (resources under templates/agent)
@@ -437,6 +436,9 @@ agent:
     # -- Interface on which to send the mirrored traffic
     interface: mirror0
 
+  interface: ""
+  dpdkTunnelInterface: "br-phy"
+
 # -- Kubelet configuration
 kubelet:
   # -- Directory in which the kubelet operates