rancher/multus-cni
1
0
Fork 0
forked from github/multus-cni
Code Issues Pull Requests Projects Releases Wiki Activity

Fixup thick deployment, make images thiner (#747)

Browse Source 
* deployment, thick: only use thick image

Signed-off-by: Etienne Champetier <e.champetier@ateme.com>

* images: only keep binaries and LICENSE

Signed-off-by: Etienne Champetier <e.champetier@ateme.com>
This commit is contained in:
Etienne Champetier 2021-11-02 01:20:37 -04:00 committed by GitHub
parent 7091831a00
commit 32c952e501
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
deployments/multus-daemonset-thick-plugin.yml
View File

@ -144,7 +144,7 @@ spec:
mountPath: /host/opt/cni/bin mountPath: /host/opt/cni/bin
initContainers: initContainers:
- name: install-multus-binary - name: install-multus-binary
image: ghcr.io/k8snetworkplumbingwg/multus-cni:stable image: ghcr.io/k8snetworkplumbingwg/multus-cni:thick
command: command:
- "cp" - "cp"
- "/usr/src/multus-cni/bin/multus" - "/usr/src/multus-cni/bin/multus"
@ -160,7 +160,7 @@ spec:
mountPath: /host/opt/cni/bin mountPath: /host/opt/cni/bin
mountPropagation: Bidirectional mountPropagation: Bidirectional
- name: generate-kubeconfig - name: generate-kubeconfig
image: docker.io/maiqueb/multus image: ghcr.io/k8snetworkplumbingwg/multus-cni:thick
command: command:
- "/usr/src/multus-cni/bin/generate-kubeconfig" - "/usr/src/multus-cni/bin/generate-kubeconfig"
args: args:

3
images/Dockerfile
View File

@ -9,7 +9,8 @@ RUN cd /usr/src/multus-cni && \
FROM centos:centos7 FROM centos:centos7
LABEL org.opencontainers.image.source https://github.com/k8snetworkplumbingwg/multus-cni LABEL org.opencontainers.image.source https://github.com/k8snetworkplumbingwg/multus-cni
COPY --from=build /usr/src/multus-cni /usr/src/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
WORKDIR / WORKDIR /
ADD ./images/entrypoint.sh / ADD ./images/entrypoint.sh /

3
images/Dockerfile.arm32
View File

@ -13,7 +13,8 @@ RUN cd /usr/src/multus-cni && \
# build arm container # build arm container
FROM arm32v7/centos:7 FROM arm32v7/centos:7
LABEL org.opencontainers.image.source https://github.com/k8snetworkplumbingwg/multus-cni LABEL org.opencontainers.image.source https://github.com/k8snetworkplumbingwg/multus-cni
COPY --from=build /usr/src/multus-cni /usr/src/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
WORKDIR / WORKDIR /
ADD ./images/entrypoint.sh / ADD ./images/entrypoint.sh /

3
images/Dockerfile.arm64
View File

@ -13,7 +13,8 @@ RUN cd /usr/src/multus-cni && \
# build arm64 container # build arm64 container
FROM arm64v8/centos:7 FROM arm64v8/centos:7
LABEL org.opencontainers.image.source https://github.com/k8snetworkplumbingwg/multus-cni LABEL org.opencontainers.image.source https://github.com/k8snetworkplumbingwg/multus-cni
COPY --from=build /usr/src/multus-cni /usr/src/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
WORKDIR / WORKDIR /
ADD ./images/entrypoint.sh / ADD ./images/entrypoint.sh /

3
images/Dockerfile.ppc64le
View File

@ -13,7 +13,8 @@ RUN cd /usr/src/multus-cni && \
# build ppc container # build ppc container
FROM ppc64le/centos:latest FROM ppc64le/centos:latest
LABEL org.opencontainers.image.source https://github.com/k8snetworkplumbingwg/multus-cni LABEL org.opencontainers.image.source https://github.com/k8snetworkplumbingwg/multus-cni
COPY --from=build /usr/src/multus-cni /usr/src/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
WORKDIR / WORKDIR /
ADD ./images/entrypoint.sh / ADD ./images/entrypoint.sh /

3
images/Dockerfile.s390x
View File

@ -13,7 +13,8 @@ RUN cd /usr/src/multus-cni && \
# build s390x container # build s390x container
FROM s390x/python:3-slim FROM s390x/python:3-slim
LABEL org.opencontainers.image.source https://github.com/k8snetworkplumbingwg/multus-cni LABEL org.opencontainers.image.source https://github.com/k8snetworkplumbingwg/multus-cni
COPY --from=build /usr/src/multus-cni /usr/src/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
WORKDIR / WORKDIR /
ADD ./images/entrypoint.sh / ADD ./images/entrypoint.sh /

3
images/Dockerfile.thick
View File

@ -9,7 +9,8 @@ RUN cd /usr/src/multus-cni && \
FROM registry.access.redhat.com/ubi8/ubi-minimal FROM registry.access.redhat.com/ubi8/ubi-minimal
LABEL org.opencontainers.image.source https://github.com/k8snetworkplumbingwg/multus-cni LABEL org.opencontainers.image.source https://github.com/k8snetworkplumbingwg/multus-cni
COPY --from=build /usr/src/multus-cni /usr/src/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
WORKDIR / WORKDIR /
ENTRYPOINT [ "/usr/src/multus-cni/bin/multus-daemon" ] ENTRYPOINT [ "/usr/src/multus-cni/bin/multus-daemon" ]