-
Notifications
You must be signed in to change notification settings - Fork 629
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
update CNI plugins (1.6.2) #3797
Conversation
Signed-off-by: Jin Dong <djdongjin95@gmail.com>
@@ -57,18 +57,18 @@ FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-bookworm AS build-base-debia | |||
COPY --from=xx / / | |||
ENV DEBIAN_FRONTEND=noninteractive | |||
RUN apt-get update -qq && apt-get install -qq --no-install-recommends \ | |||
git \ | |||
dpkg-dev | |||
git \ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ah probably editor auto format 🤦, let me change this back (and remove the 1.6.1 as well in the other comment), sry!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@AkihiroSuda actually this file has mixed 2-space and 4-space indent. After this all indents are 2-space. Maybe we should keep this format change?
4 spaces:
Lines 65 to 71 in 1220ce7
RUN xx-apt-get update -qq && xx-apt-get install -qq --no-install-recommends \ | |
binutils \ | |
gcc \ | |
libc6-dev \ | |
libbtrfs-dev \ | |
libseccomp-dev \ | |
pkg-config |
2 spaces:
Lines 79 to 83 in 1220ce7
RUN git checkout ${CONTAINERD_VERSION} && \ | |
mkdir -p /out /out/$TARGETARCH && \ | |
cp -a containerd.service /out | |
RUN GO=xx-go make STATIC=1 && \ | |
cp -a bin/containerd bin/containerd-shim-runc-v2 bin/ctr /out/$TARGETARCH |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Either is fine to me.
Probably we should have some linter to enforce either of one.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sounds good, I will keep this format change for now then for consistency. Let me see if there are some linter that can run in CI.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
cni-plugins-v1.6.1 can be removed
https://github.com/containernetworking/plugins/releases/tag/v1.6.2
Now 1.6.1 only has s390v artifacts and fails our CI:
https://github.com/containernetworking/plugins/releases/tag/v1.6.1
https://github.com/containerd/nerdctl/actions/runs/12641602765/job/35224329459?pr=3796