Skip to content

Commit 9081027

Browse files
authored
kube-ovn add disable-nm-syncer patch (#449)
Signed-off-by: Andrei Kvapil <[email protected]> Signed-off-by: Andrei Kvapil <[email protected]>
1 parent 1ec1016 commit 9081027

2 files changed

Lines changed: 16 additions & 0 deletions

File tree

‎packages/system/kubeovn/images/kubeovn/Dockerfile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ ARG COMMIT_REF=e1310e1
77

88
WORKDIR /source
99

10+
COPY patches /patches
1011
RUN wget -O- https://github.com/kubeovn/kube-ovn/archive/${COMMIT_REF}.tar.gz | tar xzf - --strip-components=1
12+
RUN git apply /patches/*.diff
1113
RUN sed -i 's|-z now|-z now -static|' Makefile
1214
RUN make build-go
1315

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
diff --git a/pkg/daemon/controller_linux.go b/pkg/daemon/controller_linux.go
2+
index 07014d11..7ff19ae0 100644
3+
--- a/pkg/daemon/controller_linux.go
4+
+++ b/pkg/daemon/controller_linux.go
5+
@@ -118,9 +118,6 @@ func (c *Controller) initRuntime() error {
6+
c.k8siptables[kubeovnv1.ProtocolIPv6] = k8siptables.New(c.k8sExec, k8siptables.ProtocolIPv6)
7+
}
8+
9+
- c.nmSyncer = newNetworkManagerSyncer()
10+
- c.nmSyncer.Run(c.transferAddrsAndRoutes)
11+
-
12+
return nil
13+
}
14+

0 commit comments

Comments
 (0)