diff --git a/packages/system/kubeovn/images/kubeovn/Dockerfile b/packages/system/kubeovn/images/kubeovn/Dockerfile index 09d7e906..5466865b 100644 --- a/packages/system/kubeovn/images/kubeovn/Dockerfile +++ b/packages/system/kubeovn/images/kubeovn/Dockerfile @@ -7,7 +7,9 @@ ARG COMMIT_REF=e1310e1 WORKDIR /source +COPY patches /patches RUN wget -O- https://github.com/kubeovn/kube-ovn/archive/${COMMIT_REF}.tar.gz | tar xzf - --strip-components=1 +RUN git apply /patches/*.diff RUN sed -i 's|-z now|-z now -static|' Makefile RUN make build-go diff --git a/packages/system/kubeovn/images/kubeovn/patches/disable-nm-syncer.diff b/packages/system/kubeovn/images/kubeovn/patches/disable-nm-syncer.diff new file mode 100644 index 00000000..c9c683f9 --- /dev/null +++ b/packages/system/kubeovn/images/kubeovn/patches/disable-nm-syncer.diff @@ -0,0 +1,14 @@ +diff --git a/pkg/daemon/controller_linux.go b/pkg/daemon/controller_linux.go +index 07014d11..7ff19ae0 100644 +--- a/pkg/daemon/controller_linux.go ++++ b/pkg/daemon/controller_linux.go +@@ -118,9 +118,6 @@ func (c *Controller) initRuntime() error { + c.k8siptables[kubeovnv1.ProtocolIPv6] = k8siptables.New(c.k8sExec, k8siptables.ProtocolIPv6) + } + +- c.nmSyncer = newNetworkManagerSyncer() +- c.nmSyncer.Run(c.transferAddrsAndRoutes) +- + return nil + } +