Merge 6c31d1c0e6 into 4a0b5073af

2025-08-01 16:12:37 +00:00 · 2025-01-16 10:53:05 -05:00 · 2025-01-16 10:53:05 -05:00 · c7c812708d
commit c7c812708d
parent 4a0b5073af 6c31d1c0e6
3 changed files with 11 additions and 7 deletions
--- a/deployments/multus-daemonset-thick.yml
+++ b/deployments/multus-daemonset-thick.yml
@ -201,9 +201,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"
--- a/e2e/templates/multus-daemonset-thick.yml.j2
+++ b/e2e/templates/multus-daemonset-thick.yml.j2
@ -170,9 +170,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"
+          - "-t"
+          - "thick"
        resources:
          requests:
            cpu: "10m"
--- a/images/Dockerfile.thick
+++ b/images/Dockerfile.thick
@ -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