kube-ovn add disable-nm-syncer patch (#449)

Signed-off-by: Andrei Kvapil <kvapss@gmail.com> Signed-off-by: Andrei Kvapil <kvapss@gmail.com>
aenix-io · Oct 21, 2024 · 9081027 · 9081027
1 parent 1ec1016
commit 9081027
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git 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
@@ -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
+ }
+