Skip to content

feat(cni-installer): integrate cni installer #784

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.

Sign up for GitHub

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

Merged
raykroeker merged 2 commits into from
Jul 8, 2026
Merged

feat(cni-installer): integrate cni installer #784

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b9325b6
feat(cni-installer): integrate cni installer
raykroeker Jul 7, 2026
6d2b0df
feat(cni-installer): remove legacy shell dependencies
raykroeker Jul 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 7 additions & 12 deletions Dockerfile-cni-plugin
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,18 @@
FROM --platform=$BUILDPLATFORM golang:1.26.4-alpine as go
WORKDIR /build
COPY --link go.mod go.sum ./
COPY --link ./cni-install ./cni-install
COPY --link ./cni-plugin ./cni-plugin
COPY --link ./internal ./internal
COPY --link ./proxy-init ./proxy-init
COPY --link ./pkg ./pkg
RUN go mod download
ARG TARGETARCH
RUN CGO_ENABLED=0 GOOS=linux GOARCH=$TARGETARCH GO111MODULE=on \
go build -o /go/bin/linkerd-cni -mod=readonly -ldflags "-s -w" -v ./cni-plugin/
RUN CGO_ENABLED=0 GOOS=linux GOARCH=$TARGETARCH GO111MODULE=on \
go build -o /go/bin/linkerd2-cni-install -mod=readonly -ldflags "-s -w" -v ./cni-install/


FROM --platform=$BUILDPLATFORM ghcr.io/linkerd/dev:v50-rust-musl as cni-repair-controller
WORKDIR /build
Expand Down Expand Up @@ -41,18 +46,8 @@ RUN --mount=type=cache,target=target \

FROM --platform=$TARGETPLATFORM alpine:3.24.1 as runtime
WORKDIR /linkerd
RUN apk add \
# For inotifywait
inotify-tools \
# For pgrep
procps \
bash \
jq

COPY --from=go /go/bin/linkerd-cni /opt/cni/bin/
COPY --from=go /go/bin/linkerd2-cni-install /usr/bin/
COPY --from=cni-repair-controller /build/linkerd-cni-repair-controller /usr/lib/linkerd/
COPY LICENSE .
COPY cni-plugin/deployment/scripts/install-cni.sh .
COPY cni-plugin/deployment/scripts/filter.jq .
ENV PATH=/linkerd:/opt/cni/bin:$PATH
CMD ["install-cni.sh"]
CMD ["/usr/bin/linkerd2-cni-install"]
13 changes: 0 additions & 13 deletions cni-plugin/deployment/scripts/filter.jq
View file
Open in desktop

This file was deleted.

Loading