feat(helm): cni config refactor

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

Author: SkalaNetworks

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

@@ -76,9 +76,9 @@ spec:
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         command:
           - /kube-ovn/install-cni.sh
-          - --cni-conf-dir={{ .Values.cni_conf.CNI_CONF_DIR }}
-          - --cni-conf-file={{ .Values.cni_conf.CNI_CONF_FILE }}
-          - --cni-conf-name={{- .Values.cni_conf.CNI_CONFIG_PRIORITY -}}-kube-ovn.conflist
+          - --cni-conf-dir={{ .Values.cni.configDirectory }}
+          - --cni-conf-file={{ .Values.cni.localConfigFile }}
+          - --cni-conf-name={{- .Values.cni.configPriority -}}-kube-ovn.conflist
         securityContext:
           runAsUser: 0
           privileged: true
@@ -87,7 +87,7 @@ spec:
             name: cni-bin
           - mountPath: /etc/cni/net.d
             name: cni-conf
-          {{- if .Values.cni_conf.MOUNT_LOCAL_BIN_DIR }}
+          {{- if .Values.cni.mountToolingDirectory }}
           - mountPath: /usr/local/bin
             name: local-bin
           {{- end }}
@@ -251,10 +251,10 @@ spec:
             path: /run/ovn
         - name: cni-conf
           hostPath:
-            path: {{ .Values.cni_conf.CNI_CONF_DIR }}
+            path: {{ .Values.cni.configDirectory }}
         - name: cni-bin
           hostPath:
-            path: {{ .Values.cni_conf.CNI_BIN_DIR }}
+            path: {{ .Values.cni.binaryDirectory }}
         - name: host-ns
           hostPath:
             path: /var/run/netns
@@ -273,8 +273,8 @@ spec:
         - name: host-log-ovn
           hostPath:
             path: {{ .Values.log_conf.LOG_DIR }}/ovn
-        {{- if .Values.cni_conf.MOUNT_LOCAL_BIN_DIR }}
+        {{- if .Values.cni.mountToolingDirectory }}
         - name: local-bin
           hostPath:
-            path: {{ .Values.cni_conf.LOCAL_BIN_DIR }}
+            path: {{ .Values.cni.toolingDirectory }}
         {{- end }}

charts/kube-ovn/templates/ic-controller-deploy.yaml renamed to charts/kube-ovn/templates/ic/ic-controller-deploy.yaml

@@ -113,13 +113,21 @@ debug:
   ENABLE_MIRROR: false
   MIRROR_IFACE: "mirror0"
 
-cni_conf:
-  CNI_CONFIG_PRIORITY: "01"
-  CNI_CONF_DIR: "/etc/cni/net.d"
-  CNI_BIN_DIR: "/opt/cni/bin"
-  CNI_CONF_FILE: "/kube-ovn/01-kube-ovn.conflist"
-  LOCAL_BIN_DIR: "/usr/local/bin"
-  MOUNT_LOCAL_BIN_DIR: false
+# CNI binary/configuration injected on the nodes
+cni:
+  # -- Location of the CNI configuration on the node
+  configDirectory: "/etc/cni/net.d"
+  # -- Location on the node where the agent will inject the Kube-OVN binary
+  binaryDirectory: "/opt/cni/bin"
+  # -- Location of the CNI configuration inside the agent's pod
+  localConfigFile: "/kube-ovn/01-kube-ovn.conflist"
+  # -- Location on the node where the CNI will install Kube-OVN's tooling
+  toolingDirectory: "/usr/local/bin"
+  # -- Whether to mount the node's tooling directory into the pod
+  mountToolingDirectory: false
+  # -- Priority of Kube-OVN within the CNI configuration directory on the node
+  # Should be a string representing a double-digit integer
+  configPriority: "01"
 
 kubelet_conf:
   KUBELET_DIR: "/var/lib/kubelet"
@@ -163,6 +171,7 @@ natGw:
       tag: v1.14.0
       pullPolicy: IfNotPresent
     # -- Network attachment definition used to reach the API server when running on BGP mode
+    # By default, equals the value set at .apiNad.provider
     # See https://kubeovn.github.io/docs/stable/en/advance/with-bgp/
     apiNadProvider: "{{ .Values.apiNad.name }}.{{ .Values.namespace }}.ovn"
 
@@ -403,7 +412,7 @@ extraObjects: []
 # - apiVersion: v1
 #   kind: ConfigMap
 #   metadata:
-#     name: cni-config
+#     name: cilium-chaining
 #   data:
 #     cni-config: |-
 #       {