From 7834dbcdc4366b5c52e368fc6653e19673d01c1e Mon Sep 17 00:00:00 2001 From: Byron wang Date: Fri, 19 Jan 2024 15:39:00 +0800 Subject: [PATCH 1/5] update deploy file: use install_multus bin to update cni file --- deployments/multus-daemonset-thick.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/deployments/multus-daemonset-thick.yml b/deployments/multus-daemonset-thick.yml index 117c1f0e7..a0db0c430 100644 --- a/deployments/multus-daemonset-thick.yml +++ b/deployments/multus-daemonset-thick.yml @@ -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" From efa51cfd74869699736faa9f79c2c13084c2e909 Mon Sep 17 00:00:00 2001 From: Byron wang Date: Wed, 21 Feb 2024 13:59:15 +0800 Subject: [PATCH 2/5] update thick image to distroless debian --- images/Dockerfile.thick | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/Dockerfile.thick b/images/Dockerfile.thick index ae170150a..30a898924 100644 --- 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 From ac12368419ebbb04ff22d22df7cf09749e4caa89 Mon Sep 17 00:00:00 2001 From: Byron wang Date: Thu, 25 Apr 2024 15:16:12 +0800 Subject: [PATCH 3/5] update e2e thick template yamls --- e2e/templates/multus-daemonset-thick.yml.j2 | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/e2e/templates/multus-daemonset-thick.yml.j2 b/e2e/templates/multus-daemonset-thick.yml.j2 index 8fdc8e4c5..ce0e762e4 100644 --- a/e2e/templates/multus-daemonset-thick.yml.j2 +++ b/e2e/templates/multus-daemonset-thick.yml.j2 @@ -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" + - "-t" + - "thick" resources: requests: cpu: "10m" From 3db8d7721618d4557209b66b9c8dd871af77f2a7 Mon Sep 17 00:00:00 2001 From: "Byron.wang" Date: Fri, 26 Apr 2024 08:33:47 +0800 Subject: [PATCH 4/5] Update multus-daemonset-thick.yml.j2 --- e2e/templates/multus-daemonset-thick.yml.j2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/e2e/templates/multus-daemonset-thick.yml.j2 b/e2e/templates/multus-daemonset-thick.yml.j2 index ce0e762e4..90cc6839b 100644 --- a/e2e/templates/multus-daemonset-thick.yml.j2 +++ b/e2e/templates/multus-daemonset-thick.yml.j2 @@ -168,8 +168,8 @@ spec: - name: install-multus-shim image: localhost:5000/multus:e2e command: - - "/usr/src/multus-cni/bin/install_multus" - - "-d" + - "/usr/src/multus-cni/bin/install_multus" + - "-d" - "/host/opt/cni/bin" - "-t" - "thick" From 6c31d1c0e690234e56b26def7474c0bffc072b67 Mon Sep 17 00:00:00 2001 From: Byron Wang Date: Sat, 27 Apr 2024 12:20:14 +0800 Subject: [PATCH 5/5] fix indentation error in e2e --- e2e/templates/multus-daemonset-thick.yml.j2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/e2e/templates/multus-daemonset-thick.yml.j2 b/e2e/templates/multus-daemonset-thick.yml.j2 index 90cc6839b..b39d0a3c7 100644 --- a/e2e/templates/multus-daemonset-thick.yml.j2 +++ b/e2e/templates/multus-daemonset-thick.yml.j2 @@ -168,8 +168,8 @@ spec: - name: install-multus-shim image: localhost:5000/multus:e2e command: - - "/usr/src/multus-cni/bin/install_multus" - - "-d" + - "/usr/src/multus-cni/bin/install_multus" + - "-d" - "/host/opt/cni/bin" - "-t" - "thick"