Merge pull request #64 from rancher/updatecli_main_8e58fb40c6cd1a6945…

…31f3a58f52daab39f60a20982072ea0fd4c283e2d23eda

Bump multus version to v4.1.0

Dockerfile

@@ -13,19 +13,13 @@ RUN set -x && \
 
 # Build the multus project
 FROM base-builder as multus-builder
-ARG TAG=v4.0.2
+ARG TAG=v4.1.0
 ARG SRC=github.com/k8snetworkplumbingwg/multus-cni
 ARG PKG=github.com/k8snetworkplumbingwg/multus-cni
 RUN git clone --depth=1 https://${SRC}.git $GOPATH/src/${PKG}
 WORKDIR $GOPATH/src/${PKG}
-# patch to solve https://github.com/rancher/rke2/issues/4568
-# to be removed once upstream merges the fix
-# https://github.com/k8snetworkplumbingwg/multus-cni/pull/1137
-COPY self_delegation_bug.patch /tmp
-
 RUN git fetch --all --tags --prune && \
-    git checkout tags/${TAG} -b ${TAG} && \
-    git apply /tmp/self_delegation_bug.patch
+    git checkout tags/${TAG} -b ${TAG}
 RUN go mod download
 # cross-compilation setup
 ARG TARGETARCH

Makefile

@@ -17,7 +17,7 @@ SRC ?= github.com/k8snetworkplumbingwg/multus-cni
 TAG ?= ${GITHUB_ACTION_TAG}
 
 ifeq ($(TAG),)
-TAG := v4.0.2$(BUILD_META)
+TAG := v4.1.0$(BUILD_META)
 endif
 
 ifeq (,$(filter %$(BUILD_META),$(TAG)))