Skip to content
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

update deploy file: use install_multus bin to update cni file #1213

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
+11 −7
Open

update deploy file: use install_multus bin to update cni file #1213

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7834dbc
update deploy file: use install_multus bin to update cni file
41tair Jan 19, 2024
efa51cf
update thick image to distroless debian
41tair Feb 21, 2024
ac12368
update e2e thick template yamls
41tair Apr 25, 2024
3db8d77
Update multus-daemonset-thick.yml.j2
41tair Apr 26, 2024
6c31d1c
fix indentation error in e2e
41tair Apr 27, 2024
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
8 changes: 5 additions & 3 deletions deployments/multus-daemonset-thick.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,9 +199,11 @@ spec:
- name: install-multus-binary
image: ghcr.io/k8snetworkplumbingwg/multus-cni:snapshot-thick
command:
- "cp"
- "/usr/src/multus-cni/bin/multus-shim"
- "/host/opt/cni/bin/multus-shim"
- "/usr/src/multus-cni/bin/install_multus"
- "-d"
- "/host/opt/cni/bin"
- "-t"
- "thick"
resources:
requests:
cpu: "10m"
Expand Down
8 changes: 5 additions & 3 deletions e2e/templates/multus-daemonset-thick.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,9 +168,11 @@ spec:
- name: install-multus-shim
image: localhost:5000/multus:e2e
command:
- "cp"
- "/usr/src/multus-cni/bin/multus-shim"
- "/host/opt/cni/bin/multus-shim"
- "/usr/src/multus-cni/bin/install_multus"
- "-d"
- "/host/opt/cni/bin"
41tair marked this conversation as resolved.
Show resolved Hide resolved
- "-t"
- "thick"
resources:
requests:
cpu: "10m"
Expand Down
2 changes: 1 addition & 1 deletion images/Dockerfile.thick
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ADD . /usr/src/multus-cni
RUN cd /usr/src/multus-cni && \
./hack/build-go.sh

FROM debian:stable-slim
FROM gcr.io/distroless/base-debian11:latest
LABEL org.opencontainers.image.source https://github.com/k8snetworkplumbingwg/multus-cni
COPY --from=build /usr/src/multus-cni/bin /usr/src/multus-cni/bin
COPY --from=build /usr/src/multus-cni/LICENSE /usr/src/multus-cni/LICENSE
Expand Down