From 28793f8f3960e3f413b1b81c90b1d706d1a73508 Mon Sep 17 00:00:00 2001 From: Miguel Duarte Barroso Date: Tue, 1 Mar 2022 09:34:59 +0100 Subject: [PATCH] build, dockerfiles: add reconciler The ip-reconciler is only currently being shipped in the amd64 images. This commit adds it to both the arm64 and openshift images, thus aligning all of them. Signed-off-by: Miguel Duarte Barroso --- Dockerfile.arm64 | 1 + Dockerfile.openshift | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index 7f0b6d1db..d7691fe26 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -12,5 +12,6 @@ RUN ./hack/build-go.sh FROM arm64v8/alpine:latest LABEL org.opencontainers.image.source https://github.com/k8snetworkplumbingwg/whereabouts COPY --from=0 /go/src/github.com/k8snetworkplumbingwg/whereabouts/bin/whereabouts . +COPY --from=0 /go/src/github.com/k8snetworkplumbingwg/whereabouts/bin/ip-reconciler . COPY script/install-cni.sh . CMD ["/install-cni.sh"] diff --git a/Dockerfile.openshift b/Dockerfile.openshift index 475132f5a..34897ed1c 100644 --- a/Dockerfile.openshift +++ b/Dockerfile.openshift @@ -4,13 +4,15 @@ ADD . /go/src/github.com/k8snetworkplumbingwg/whereabouts WORKDIR /go/src/github.com/k8snetworkplumbingwg/whereabouts ENV CGO_ENABLED=1 ENV GO111MODULE=on -RUN go build -mod vendor -o bin/whereabouts cmd/whereabouts.go +RUN go build -mod vendor -o bin/whereabouts cmd/whereabouts.go +RUN go build -mod vendor -o bin/ip-reconciler cmd/reconciler/ip.go cmd/reconciler/errors.go WORKDIR / FROM openshift/origin-base RUN mkdir -p /usr/src/whereabouts/images && \ mkdir -p /usr/src/whereabouts/bin -COPY --from=builder /go/src/github.com/k8snetworkplumbingwg/whereabouts/bin/whereabouts /usr/src/whereabouts/bin +COPY --from=builder /go/src/github.com/k8snetworkplumbingwg/whereabouts/bin/whereabouts /usr/src/whereabouts/bin +COPY --from=builder /go/src/github.com/k8snetworkplumbingwg/whereabouts/bin/ip-reconciler /usr/src/whereabouts/bin LABEL org.opencontainers.image.source https://github.com/k8snetworkplumbingwg/whereabouts LABEL io.k8s.display-name="Whereabouts CNI" \