drop multus self_delegation_bug patch

drop bbcceb7 which has been resolved upstream: k8snetworkplumbingwg/multus-cni#1142 Signed-off-by: Michael Fritch <[email protected]>
rancher · Aug 8, 2024 · f5d3909 · f5d3909
1 parent cdb399e
commit f5d3909
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 43 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -18,14 +18,8 @@ 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

diff --git a/self_delegation_bug.patch b/self_delegation_bug.patch