diff --git a/packages/rke2-multus/package.yaml b/packages/rke2-multus/package.yaml index 22e14ad84..0c7cda399 100644 --- a/packages/rke2-multus/package.yaml +++ b/packages/rke2-multus/package.yaml @@ -1,3 +1,3 @@ url: local workingDir: charts -packageVersion: 02 +packageVersion: 03 diff --git a/packages/rke2-whereabouts/charts/templates/daemonset.yaml b/packages/rke2-whereabouts/charts/templates/daemonset.yaml index db169404d..af6805375 100644 --- a/packages/rke2-whereabouts/charts/templates/daemonset.yaml +++ b/packages/rke2-whereabouts/charts/templates/daemonset.yaml @@ -67,10 +67,10 @@ spec: volumes: - name: cnibin hostPath: - path: /opt/cni/bin + path: {{ .Values.cniConf.binDir }} - name: cni-net-dir hostPath: - path: /etc/cni/net.d + path: {{ .Values.cniConf.confDir }} - name: cron-scheduler-configmap configMap: name: {{ include "whereabouts.fullname" . }}-config diff --git a/packages/rke2-whereabouts/charts/values.yaml b/packages/rke2-whereabouts/charts/values.yaml index d140c985c..e177563df 100644 --- a/packages/rke2-whereabouts/charts/values.yaml +++ b/packages/rke2-whereabouts/charts/values.yaml @@ -46,5 +46,9 @@ tolerations: affinity: {} +cniConf: + confDir: /etc/cni/net.d + binDir: /opt/cni/bin + global: systemDefaultRegistry: "" diff --git a/packages/rke2-whereabouts/package.yaml b/packages/rke2-whereabouts/package.yaml index 201a1c84a..51f34ec0e 100644 --- a/packages/rke2-whereabouts/package.yaml +++ b/packages/rke2-whereabouts/package.yaml @@ -1,5 +1,5 @@ url: local workingDir: charts -packageVersion: 02 +packageVersion: 03 # whereabouts is only used as a dependency of multus doNotRelease: true