From f047e22dabe8a654cefecb2440cfbdcbee790851 Mon Sep 17 00:00:00 2001 From: camrynl <31013536+camrynl@users.noreply.github.com> Date: Thu, 8 Sep 2022 14:13:10 -0700 Subject: [PATCH 1/5] pack released version of azure-ipam --- dropgz/build/cni.Dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dropgz/build/cni.Dockerfile b/dropgz/build/cni.Dockerfile index 34f13239db..3bfe79725b 100644 --- a/dropgz/build/cni.Dockerfile +++ b/dropgz/build/cni.Dockerfile @@ -2,9 +2,11 @@ FROM mcr.microsoft.com/oss/cilium/cilium:1.12.1.1 as cilium FROM mcr.microsoft.com/oss/go/microsoft/golang:1.19 AS azure-ipam ARG VERSION +ARG OS +ARG ARCH WORKDIR /azure-ipam COPY ./azure-ipam . -RUN CGO_ENABLED=0 go build -a -o bin/azure-ipam -trimpath -ldflags "-X main.version="$VERSION"" -gcflags="-dwarflocationlists=true" . +RUN curl -LO https://github.com/Azure/azure-container-networking/releases/download/azure-ipam%2Fv0.0.2/azure-ipam-$OS-$ARCH-v0.0.2.tgz && tar -xvf azure-ipam-$OS-$ARCH-v0.0.2.tgz FROM mcr.microsoft.com/oss/go/microsoft/golang:1.19 AS azure-vnet ARG VERSION @@ -19,7 +21,7 @@ ARG OS WORKDIR /dropgz COPY dropgz . COPY --from=azure-ipam /azure-ipam/*.conflist pkg/embed/fs -COPY --from=azure-ipam /azure-ipam/bin/* pkg/embed/fs +COPY --from=azure-ipam /azure-ipam/azure-ipam pkg/embed/fs COPY --from=azure-vnet /azure-container-networking/cni/azure-$OS-swift.conflist pkg/embed/fs/azure-swift.conflist COPY --from=azure-vnet /azure-container-networking/azure-vnet pkg/embed/fs COPY --from=azure-vnet /azure-container-networking/azure-vnet-telemetry pkg/embed/fs From f96074dedba019cee184690ed8794bbb1db7692d Mon Sep 17 00:00:00 2001 From: camrynl <31013536+camrynl@users.noreply.github.com> Date: Fri, 9 Sep 2022 10:16:45 -0700 Subject: [PATCH 2/5] add cert installation --- dropgz/build/cni.Dockerfile | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/dropgz/build/cni.Dockerfile b/dropgz/build/cni.Dockerfile index 3bfe79725b..3d5e51656a 100644 --- a/dropgz/build/cni.Dockerfile +++ b/dropgz/build/cni.Dockerfile @@ -1,20 +1,27 @@ -FROM mcr.microsoft.com/oss/cilium/cilium:1.12.1.1 as cilium +FROM mcr.microsoft.com/cbl-mariner/base/core:2.0 AS certs +RUN tdnf upgrade -y && tdnf install -y ca-certificates -FROM mcr.microsoft.com/oss/go/microsoft/golang:1.19 AS azure-ipam +FROM mcr.microsoft.com/cbl-mariner/base/core:2.0 AS tar +RUN tdnf install -y tar + +FROM tar AS azure-ipam ARG VERSION ARG OS ARG ARCH WORKDIR /azure-ipam COPY ./azure-ipam . -RUN curl -LO https://github.com/Azure/azure-container-networking/releases/download/azure-ipam%2Fv0.0.2/azure-ipam-$OS-$ARCH-v0.0.2.tgz && tar -xvf azure-ipam-$OS-$ARCH-v0.0.2.tgz +COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt +RUN curl -LO --cacert /etc/ssl/certs/ca-certificates.crt https://github.com/Azure/azure-container-networking/releases/download/azure-ipam%2Fv0.0.2/azure-ipam-$OS-$ARCH-v0.0.2.tgz && tar -xvf azure-ipam-$OS-$ARCH-v0.0.2.tgz -FROM mcr.microsoft.com/oss/go/microsoft/golang:1.19 AS azure-vnet +FROM tar AS azure-vnet ARG VERSION ARG OS ARG ARCH WORKDIR /azure-container-networking COPY . . -RUN curl -LO https://github.com/Azure/azure-container-networking/releases/download/v1.4.29/azure-vnet-cni-swift-$OS-$ARCH-v1.4.29.tgz && tar -xvf azure-vnet-cni-swift-$OS-$ARCH-v1.4.29.tgz +# COPY --from=certs /certs . +COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt +RUN curl -LO --cacert /etc/ssl/certs/ca-certificates.crt https://github.com/Azure/azure-container-networking/releases/download/v1.4.29/azure-vnet-cni-swift-$OS-$ARCH-v1.4.29.tgz && tar -xvf azure-vnet-cni-swift-$OS-$ARCH-v1.4.29.tgz FROM mcr.microsoft.com/cbl-mariner/base/core:2.0 AS compressor ARG OS @@ -26,7 +33,8 @@ COPY --from=azure-vnet /azure-container-networking/cni/azure-$OS-swift.conflist COPY --from=azure-vnet /azure-container-networking/azure-vnet pkg/embed/fs COPY --from=azure-vnet /azure-container-networking/azure-vnet-telemetry pkg/embed/fs COPY --from=azure-vnet /azure-container-networking/azure-vnet-ipam pkg/embed/fs -COPY --from=cilium /opt/cni/bin/cilium-cni pkg/embed/fs +COPY --from=mcr.microsoft.com/oss/cilium/cilium:1.12.1.1 /opt/cni/bin/cilium-cni pkg/embed/fs +# COPY --from=certs . pkg/embed/fs RUN cd pkg/embed/fs/ && sha256sum * > sum.txt RUN gzip --verbose --best --recursive pkg/embed/fs && for f in pkg/embed/fs/*.gz; do mv -- "$f" "${f%%.gz}"; done From d7e57183ccea5000d0d742ba0f59f82278aa96e1 Mon Sep 17 00:00:00 2001 From: camrynl <31013536+camrynl@users.noreply.github.com> Date: Fri, 9 Sep 2022 10:35:47 -0700 Subject: [PATCH 3/5] remove commented lines --- dropgz/build/cni.Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/dropgz/build/cni.Dockerfile b/dropgz/build/cni.Dockerfile index 3d5e51656a..89c566ece1 100644 --- a/dropgz/build/cni.Dockerfile +++ b/dropgz/build/cni.Dockerfile @@ -19,7 +19,6 @@ ARG OS ARG ARCH WORKDIR /azure-container-networking COPY . . -# COPY --from=certs /certs . COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt RUN curl -LO --cacert /etc/ssl/certs/ca-certificates.crt https://github.com/Azure/azure-container-networking/releases/download/v1.4.29/azure-vnet-cni-swift-$OS-$ARCH-v1.4.29.tgz && tar -xvf azure-vnet-cni-swift-$OS-$ARCH-v1.4.29.tgz @@ -34,7 +33,6 @@ COPY --from=azure-vnet /azure-container-networking/azure-vnet pkg/embed/fs COPY --from=azure-vnet /azure-container-networking/azure-vnet-telemetry pkg/embed/fs COPY --from=azure-vnet /azure-container-networking/azure-vnet-ipam pkg/embed/fs COPY --from=mcr.microsoft.com/oss/cilium/cilium:1.12.1.1 /opt/cni/bin/cilium-cni pkg/embed/fs -# COPY --from=certs . pkg/embed/fs RUN cd pkg/embed/fs/ && sha256sum * > sum.txt RUN gzip --verbose --best --recursive pkg/embed/fs && for f in pkg/embed/fs/*.gz; do mv -- "$f" "${f%%.gz}"; done From 4a83cad1b0e69f13dd725344654ad86abf85ffd5 Mon Sep 17 00:00:00 2001 From: camrynl <31013536+camrynl@users.noreply.github.com> Date: Fri, 9 Sep 2022 10:57:34 -0700 Subject: [PATCH 4/5] remove cilium from dropgz --- dropgz/build/cni.Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/dropgz/build/cni.Dockerfile b/dropgz/build/cni.Dockerfile index 89c566ece1..4db0eab159 100644 --- a/dropgz/build/cni.Dockerfile +++ b/dropgz/build/cni.Dockerfile @@ -32,7 +32,6 @@ COPY --from=azure-vnet /azure-container-networking/cni/azure-$OS-swift.conflist COPY --from=azure-vnet /azure-container-networking/azure-vnet pkg/embed/fs COPY --from=azure-vnet /azure-container-networking/azure-vnet-telemetry pkg/embed/fs COPY --from=azure-vnet /azure-container-networking/azure-vnet-ipam pkg/embed/fs -COPY --from=mcr.microsoft.com/oss/cilium/cilium:1.12.1.1 /opt/cni/bin/cilium-cni pkg/embed/fs RUN cd pkg/embed/fs/ && sha256sum * > sum.txt RUN gzip --verbose --best --recursive pkg/embed/fs && for f in pkg/embed/fs/*.gz; do mv -- "$f" "${f%%.gz}"; done From 0da2eba0fe344c51623b9b03404bcafcffacf63c Mon Sep 17 00:00:00 2001 From: camrynl <31013536+camrynl@users.noreply.github.com> Date: Fri, 9 Sep 2022 15:53:27 -0700 Subject: [PATCH 5/5] use azure-ipam/v0.0.3 --- dropgz/build/cni.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dropgz/build/cni.Dockerfile b/dropgz/build/cni.Dockerfile index 4db0eab159..de55d6d916 100644 --- a/dropgz/build/cni.Dockerfile +++ b/dropgz/build/cni.Dockerfile @@ -11,7 +11,7 @@ ARG ARCH WORKDIR /azure-ipam COPY ./azure-ipam . COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt -RUN curl -LO --cacert /etc/ssl/certs/ca-certificates.crt https://github.com/Azure/azure-container-networking/releases/download/azure-ipam%2Fv0.0.2/azure-ipam-$OS-$ARCH-v0.0.2.tgz && tar -xvf azure-ipam-$OS-$ARCH-v0.0.2.tgz +RUN curl -LO --cacert /etc/ssl/certs/ca-certificates.crt https://github.com/Azure/azure-container-networking/releases/download/azure-ipam%2Fv0.0.3/azure-ipam-$OS-$ARCH-v0.0.3.tgz && tar -xvf azure-ipam-$OS-$ARCH-v0.0.3.tgz FROM tar AS azure-vnet ARG VERSION