diff --git a/system/kube-cni/Chart.yaml b/system/kube-cni/Chart.yaml index 78b76a5871e..9e2b8052f10 100644 --- a/system/kube-cni/Chart.yaml +++ b/system/kube-cni/Chart.yaml @@ -1,4 +1,4 @@ apiVersion: v2 description: Kubernetes CNI Plugins name: kube-cni -version: 0.0.4 +version: 0.0.5 diff --git a/system/kube-cni/templates/daemonset.yaml b/system/kube-cni/templates/daemonset.yaml index 46276049b80..bf26b114438 100644 --- a/system/kube-cni/templates/daemonset.yaml +++ b/system/kube-cni/templates/daemonset.yaml @@ -34,13 +34,14 @@ spec: - name: cni-plugin mountPath: /opt/cni/bin {{- if .Values.plugins.multus }} + {{- $multusMajor := .Values.images.multus.tag | toString | trimPrefix "v" | splitList "." | first | int }} - name: install-multus-cni-plugin image: "{{ required ".Values.global.registryAlternateRegion is missing" .Values.global.registryAlternateRegion }}/{{ .Values.images.multus.image }}:{{ .Values.images.multus.tag }}" command: - cp args: - -f - - /multus-cni/multus-cni + - {{ if ge $multusMajor 4 }}/multus-cni/multus{{ else }}/multus-cni/multus-cni{{ end }} - /opt/cni/bin/multus-cni volumeMounts: - name: cni-plugin