Skip to content

Commit

Permalink
drop multus self_delegation_bug patch
Browse files Browse the repository at this point in the history
drop bbcceb7
which has been resolved upstream:
k8snetworkplumbingwg/multus-cni#1142

Signed-off-by: Michael Fritch <[email protected]>
  • Loading branch information
mgfritch committed Aug 8, 2024
1 parent cdb399e commit 9824ffe
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 43 deletions.
8 changes: 1 addition & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
36 changes: 0 additions & 36 deletions self_delegation_bug.patch

This file was deleted.

0 comments on commit 9824ffe

Please sign in to comment.