Uncomment some multus options

Signed-off-by: Manuel Buil <[email protected]>
rancher · Feb 15, 2024 · ebd34a7 · ebd34a7
1 parent 9670b89
commit ebd34a7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 12 deletions.
diff --git a/packages/rke2-multus/charts/templates/daemonSet.yaml b/packages/rke2-multus/charts/templates/daemonSet.yaml
@@ -73,12 +73,6 @@ spec:
         {{- if .Values.config.cni_conf.cniVersion }}
         - "--cni-version={{ .Values.config.cni_conf.cniVersion }}"
         {{- end }}
-        {{- if .Values.config.cni_conf.confDir }}
-        - "--cni-conf-dir=={{ .Values.config.cni_conf.confDir }}"
-        {{- end }}
-        {{- if .Values.config.cni_conf.binDir }}
-        - "--cni-bin-dir={{ .Values.config.cni_conf.binDir }}"
-        {{- end }}
         {{- if .Values.config.cni_conf.multusAutoconfigDir }}
         - "--multus-autoconfig-dir={{ .Values.config.cni_conf.multusAutoconfigDir }}"
         {{- end }}
@@ -130,10 +124,10 @@ spec:
       volumes:
         - name: cni
           hostPath:
-            path: /etc/cni/net.d
+            path: {{ .Values.config.cni_conf.confDir }}
         - name: cnibin
           hostPath:
-            path: /opt/cni/bin
+            path: {{ .Values.config.cni_conf.binDir }}
         {{- if .Values.manifests.configMap }}
         - name: multus-cfg
           configMap:

diff --git a/packages/rke2-multus/charts/values.yaml b/packages/rke2-multus/charts/values.yaml
@@ -84,16 +84,16 @@ labels:
 # For more details, see https://github.com/k8snetworkplumbingwg/multus-cni/blob/master/docs/how-to-use.md#entrypoint-script-parameters
 config:
   cni_conf:
-    #confDir: /etc/cni/net.d
-    #binDir: /opt/cni/bin
+    confDir: /etc/cni/net.d
+    binDir: /opt/cni/bin
     #namespaceIsolation: false
     #globalNamespaces: default,foo,bar
     #skipMultusBinaryCopy: false
     #readinessIndicatorFile: ""
     multusConfFile: auto #or specify a file to be copied on each node
     #The following options can be used only when multusConfFile=auto
     #multusAutoconfigDir: /host/etc/cni/net.d
-    #kubeconfig: /etc/cni/net.d/multus.d/multus.kubeconfig
+    kubeconfig: /etc/cni/net.d/multus.d/multus.kubeconfig
     #masterCniFilename:
     #logFile: /var/log/multus.log
     #logLevel: panic

diff --git a/packages/rke2-multus/package.yaml b/packages/rke2-multus/package.yaml
@@ -1,3 +1,3 @@
 url: local
 workingDir: charts
-packageVersion: 00
+packageVersion: 01