diff --git a/azure-ipam/azilium.conflist b/azure-ipam/azilium.conflist new file mode 100644 index 0000000000..37ea9f0849 --- /dev/null +++ b/azure-ipam/azilium.conflist @@ -0,0 +1,14 @@ +{ + "cniVersion": "0.3.1", + "name": "cilium", + "plugins": [ + { + "type": "cilium-cni", + "ipam": { + "type": "azure-ipam" + }, + "enable-debug": true, + "log-file": "/var/log/cilium-cni.log" + } + ] +} diff --git a/dropgz/build/cni.Dockerfile b/dropgz/build/cni.Dockerfile index a2faef5b1c..956ec989fb 100644 --- a/dropgz/build/cni.Dockerfile +++ b/dropgz/build/cni.Dockerfile @@ -1,3 +1,11 @@ +FROM mcr.microsoft.com/oss/cilium/cilium:v1.12.0 as cilium + +FROM mcr.microsoft.com/oss/go/microsoft/golang:1.18 AS azure-ipam +ARG VERSION +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" . + FROM mcr.microsoft.com/oss/go/microsoft/golang:1.18 AS azure-vnet ARG VERSION WORKDIR /azure-container-networking @@ -7,8 +15,11 @@ RUN CGO_ENABLED=0 go build -a -o bin/azure-vnet -trimpath -ldflags "-X main.vers FROM mcr.microsoft.com/cbl-mariner/base/core:2.0 AS compressor WORKDIR /dropgz COPY dropgz . -COPY --from=azure-vnet /azure-container-networking/bin/* pkg/embed/fs +COPY --from=azure-ipam /azure-ipam/*.conflist pkg/embed/fs +COPY --from=azure-ipam /azure-ipam/bin/* pkg/embed/fs COPY --from=azure-vnet /azure-container-networking/cni/*.conflist pkg/embed/fs +COPY --from=azure-vnet /azure-container-networking/bin/* pkg/embed/fs +COPY --from=cilium /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