Fixup thick deployment, make images thiner (#747)

* 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>

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:

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 /

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 /

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 /

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 /

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 /
 

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" ]