diff --git a/charts/kubezero-network/Chart.yaml b/charts/kubezero-network/Chart.yaml index 98815af..e78f7e5 100644 --- a/charts/kubezero-network/Chart.yaml +++ b/charts/kubezero-network/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: kubezero-network description: KubeZero umbrella chart for all things network type: application -version: 0.1.1 +version: 0.1.3 home: https://kubezero.com icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png keywords: diff --git a/charts/kubezero-network/templates/multus/daemonset.yaml b/charts/kubezero-network/templates/multus/daemonset.yaml index 16573df..e9558bf 100644 --- a/charts/kubezero-network/templates/multus/daemonset.yaml +++ b/charts/kubezero-network/templates/multus/daemonset.yaml @@ -113,7 +113,6 @@ spec: args: - "--multus-conf-file=auto" - "--cni-version=0.3.1" - - "--cni-bin-dir=/host/usr/libexec/cni" resources: requests: cpu: "100m" @@ -131,9 +130,26 @@ spec: - name: cni mountPath: /host/etc/cni/net.d - name: cnibin - mountPath: /host/usr/libexec/cni + mountPath: /host/opt/cni/bin - name: multus-cfg mountPath: /tmp/multus-conf + initContainers: + - name: install-multus-binary + image: ghcr.io/k8snetworkplumbingwg/multus-cni:{{ .Values.multus.tag }} + command: + - "cp" + - "/usr/src/multus-cni/bin/multus" + - "/host/opt/cni/bin/multus" + resources: + requests: + cpu: "10m" + memory: "15Mi" + securityContext: + privileged: true + volumeMounts: + - name: cnibin + mountPath: /host/opt/cni/bin + mountPropagation: Bidirectional terminationGracePeriodSeconds: 10 volumes: - name: run @@ -144,7 +160,7 @@ spec: path: /etc/cni/net.d - name: cnibin hostPath: - path: /usr/libexec/cni + path: /opt/cni/bin - name: multus-cfg configMap: name: multus-cni-config diff --git a/containers/admin/v1.21/kubezero.sh b/containers/admin/v1.21/kubezero.sh index ca234f1..0bf2254 100755 --- a/containers/admin/v1.21/kubezero.sh +++ b/containers/admin/v1.21/kubezero.sh @@ -145,7 +145,7 @@ if [ "$1" == 'upgrade' ]; then # network yq eval '.network // ""' ${HOSTFS}/etc/kubernetes/kubezero.yaml > _values.yaml - helm template kubezero/kubezero-network --version 0.1.1 --include-crds --namespace kube-system --name-template network \ + helm template kubezero/kubezero-network --version 0.1.3 --include-crds --namespace kube-system --name-template network \ -f _values.yaml --kube-version $KUBE_VERSION | kubectl apply -f - $LOG # addons @@ -299,7 +299,7 @@ elif [[ "$1" =~ "^(bootstrap|recover|join)$" ]]; then # network yq eval '.network // ""' ${HOSTFS}/etc/kubernetes/kubezero.yaml > _values.yaml - helm template kubezero/kubezero-network --version 0.1.1 --include-crds --namespace kube-system --name-template network \ + helm template kubezero/kubezero-network --version 0.1.3 --include-crds --namespace kube-system --name-template network \ -f _values.yaml --kube-version $KUBE_VERSION | kubectl apply -f - $LOG # addons