Skip to content

Commit d4eabab

Browse files
committed
ovn-controller: do not send GARP on localnet for Kube-OVN ports (#2690)
1 parent 951f89c commit d4eabab

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

dist/images/Dockerfile.base

+2
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@ RUN cd /usr/src/ && git clone -b branch-22.03 --depth=1 https://github.com/ovn-o
6060
curl -s https://github.com/kubeovn/ovn/commit/44b44df9ceb37d526594126c6f8737fafb53269c.patch | git apply && \
6161
# do not remove LB if vips is empty
6262
curl -s https://github.com/kubeovn/ovn/commit/45a4a22161e42f17f21baee9106a45964dfd3a1b.patch | git apply && \
63+
# ovn-controller: do not send GARP on localnet for Kube-OVN ports
64+
curl -s https://github.com/kubeovn/ovn/commit/8af8751cdb55f582c675db921f2526b06fd3d8c0.patch | git apply && \
6365
sed -i 's/OVN/ovn/g' debian/changelog && \
6466
rm -rf .git && \
6567
./boot.sh && \

pkg/daemon/ovs_linux.go

+2
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ func (csh cniServerHandler) configureNic(podName, podNamespace, provider, netns,
7777
// Add veth pair host end to ovs port
7878
output, err := ovs.Exec(ovs.MayExist, "add-port", "br-int", hostNicName, "--",
7979
"set", "interface", hostNicName, fmt.Sprintf("external_ids:iface-id=%s", ifaceID),
80+
fmt.Sprintf("external_ids:vendor=%s", util.CniTypeName),
8081
fmt.Sprintf("external_ids:pod_name=%s", podName),
8182
fmt.Sprintf("external_ids:pod_namespace=%s", podNamespace),
8283
fmt.Sprintf("external_ids:ip=%s", ipStr),
@@ -909,6 +910,7 @@ func (csh cniServerHandler) configureNicWithInternalPort(podName, podNamespace,
909910
output, err := ovs.Exec(ovs.MayExist, "add-port", "br-int", containerNicName, "--",
910911
"set", "interface", containerNicName, "type=internal", "--",
911912
"set", "interface", containerNicName, fmt.Sprintf("external_ids:iface-id=%s", ifaceID),
913+
fmt.Sprintf("external_ids:vendor=%s", util.CniTypeName),
912914
fmt.Sprintf("external_ids:pod_name=%s", podName),
913915
fmt.Sprintf("external_ids:pod_namespace=%s", podNamespace),
914916
fmt.Sprintf("external_ids:ip=%s", ipStr),

0 commit comments

Comments
 (0)