From 808349c94bf56529488d32e18286c167cf4a2bc5 Mon Sep 17 00:00:00 2001 From: Miguel Angel Ajo Pelayo Date: Thu, 10 Mar 2022 17:31:20 +0100 Subject: [PATCH] Fix AIO image to properly configure crio for MicroShift networking Fixes-Issue: #606 Signed-off-by: Miguel Angel Ajo Pelayo --- packaging/images/microshift-aio/Dockerfile | 2 +- .../images/microshift-aio/crio-bridge.conf | 18 ------------------ 2 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 packaging/images/microshift-aio/crio-bridge.conf diff --git a/packaging/images/microshift-aio/Dockerfile b/packaging/images/microshift-aio/Dockerfile index d7391aea7f..2d9199efd7 100644 --- a/packaging/images/microshift-aio/Dockerfile +++ b/packaging/images/microshift-aio/Dockerfile @@ -40,7 +40,7 @@ ENV BUILD_PATH=packaging/images/microshift-aio COPY --from=builder /opt/app-root/src/github.com/redhat-et/microshift/microshift /usr/local/bin/microshift COPY $BUILD_PATH/unit /usr/lib/systemd/system/microshift.service COPY $BUILD_PATH/kubelet-cgroups.conf /etc/systemd/system.conf.d/kubelet-cgroups.conf -COPY $BUILD_PATH/crio-bridge.conf /etc/cni/net.d/100-crio-bridge.conf +COPY packaging/crio.conf.d/microshift.conf /etc/crio/crio.conf.d/microshift.conf # OCP_VERSION pushed ahead to 4.9.11 because aarch64 is now available, and it is backwards compatible RUN export OCP_VERSION=4.9.11 && \ diff --git a/packaging/images/microshift-aio/crio-bridge.conf b/packaging/images/microshift-aio/crio-bridge.conf deleted file mode 100644 index 540fc11aae..0000000000 --- a/packaging/images/microshift-aio/crio-bridge.conf +++ /dev/null @@ -1,18 +0,0 @@ -{ - "cniVersion": "0.4.0", - "name": "crio", - "type": "bridge", - "bridge": "cni0", - "isGateway": true, - "ipMasq": true, - "hairpinMode": true, - "ipam": { - "type": "host-local", - "routes": [ - { "dst": "0.0.0.0/0" } - ], - "ranges": [ - [{ "subnet": "10.42.0.0/24" }] - ] - } -} \ No newline at end of file