From 32c952e501b78d571dd709b86bcd5bc31b50681c Mon Sep 17 00:00:00 2001 From: Etienne Champetier Date: Tue, 2 Nov 2021 01:20:37 -0400 Subject: [PATCH] Fixup thick deployment, make images thiner (#747) * deployment, thick: only use thick image Signed-off-by: Etienne Champetier * images: only keep binaries and LICENSE Signed-off-by: Etienne Champetier --- deployments/multus-daemonset-thick-plugin.yml | 4 ++-- images/Dockerfile | 3 ++- images/Dockerfile.arm32 | 3 ++- images/Dockerfile.arm64 | 3 ++- images/Dockerfile.ppc64le | 3 ++- images/Dockerfile.s390x | 3 ++- images/Dockerfile.thick | 3 ++- 7 files changed, 14 insertions(+), 8 deletions(-) diff --git a/deployments/multus-daemonset-thick-plugin.yml b/deployments/multus-daemonset-thick-plugin.yml index 7034ccb3..411185eb 100644 --- a/deployments/multus-daemonset-thick-plugin.yml +++ b/deployments/multus-daemonset-thick-plugin.yml @@ -144,7 +144,7 @@ spec: mountPath: /host/opt/cni/bin initContainers: - name: install-multus-binary - image: ghcr.io/k8snetworkplumbingwg/multus-cni:stable + image: ghcr.io/k8snetworkplumbingwg/multus-cni:thick command: - "cp" - "/usr/src/multus-cni/bin/multus" @@ -160,7 +160,7 @@ spec: mountPath: /host/opt/cni/bin mountPropagation: Bidirectional - name: generate-kubeconfig - image: docker.io/maiqueb/multus + image: ghcr.io/k8snetworkplumbingwg/multus-cni:thick command: - "/usr/src/multus-cni/bin/generate-kubeconfig" args: diff --git a/images/Dockerfile b/images/Dockerfile index 19efc622..6b0ea31b 100644 --- a/images/Dockerfile +++ b/images/Dockerfile @@ -9,7 +9,8 @@ RUN cd /usr/src/multus-cni && \ FROM centos:centos7 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 / ADD ./images/entrypoint.sh / diff --git a/images/Dockerfile.arm32 b/images/Dockerfile.arm32 index 25578c5d..f8e953ee 100644 --- a/images/Dockerfile.arm32 +++ b/images/Dockerfile.arm32 @@ -13,7 +13,8 @@ RUN cd /usr/src/multus-cni && \ # build arm container FROM arm32v7/centos:7 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 / ADD ./images/entrypoint.sh / diff --git a/images/Dockerfile.arm64 b/images/Dockerfile.arm64 index 097530aa..3a3cd916 100644 --- a/images/Dockerfile.arm64 +++ b/images/Dockerfile.arm64 @@ -13,7 +13,8 @@ RUN cd /usr/src/multus-cni && \ # build arm64 container FROM arm64v8/centos:7 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 / ADD ./images/entrypoint.sh / diff --git a/images/Dockerfile.ppc64le b/images/Dockerfile.ppc64le index 9b8fd7ae..caf0a643 100644 --- a/images/Dockerfile.ppc64le +++ b/images/Dockerfile.ppc64le @@ -13,7 +13,8 @@ RUN cd /usr/src/multus-cni && \ # build ppc container FROM ppc64le/centos:latest 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 / ADD ./images/entrypoint.sh / diff --git a/images/Dockerfile.s390x b/images/Dockerfile.s390x index b699685e..731c2a9b 100644 --- a/images/Dockerfile.s390x +++ b/images/Dockerfile.s390x @@ -13,7 +13,8 @@ RUN cd /usr/src/multus-cni && \ # build s390x container FROM s390x/python:3-slim 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 / ADD ./images/entrypoint.sh / diff --git a/images/Dockerfile.thick b/images/Dockerfile.thick index 252232a9..b359ac11 100644 --- a/images/Dockerfile.thick +++ b/images/Dockerfile.thick @@ -9,7 +9,8 @@ RUN cd /usr/src/multus-cni && \ FROM registry.access.redhat.com/ubi8/ubi-minimal 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 / ENTRYPOINT [ "/usr/src/multus-cni/bin/multus-daemon" ]