Merge pull request ovn-kubernetes#1089 from dceara/ovn-monitor-all

cluster.go: Disable Southbound DB conditional monitoring.
moshe010 · Feb 23, 2020 · 4ad790c · 4ad790c
2 parents 7d51345 + 4155528
commit 4ad790c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/go-controller/pkg/cluster/cluster.go b/go-controller/pkg/cluster/cluster.go
@@ -57,6 +57,7 @@ func setupOVNNode(node *kapi.Node) error {
 		fmt.Sprintf("external_ids:ovn-openflow-probe-interval=%d",
 			config.Default.OpenFlowProbe),
 		fmt.Sprintf("external_ids:hostname=\"%s\"", nodeName),
+		"external_ids:ovn-monitor-all=true",
 	)
 	if err != nil {
 		return fmt.Errorf("error setting OVS external IDs: %v\n  %q", err, stderr)

diff --git a/go-controller/pkg/cluster/node_test.go b/go-controller/pkg/cluster/node_test.go
@@ -59,7 +59,8 @@ var _ = Describe("Node Operations", func() {
 					"external_ids:ovn-encap-ip=%s "+
 					"external_ids:ovn-remote-probe-interval=%d "+
 					"external_ids:ovn-openflow-probe-interval=%d "+
-					"external_ids:hostname=\"%s\"",
+					"external_ids:hostname=\"%s\" "+
+					"external_ids:ovn-monitor-all=true",
 					nodeIP, interval, ofintval, nodeName),
 			})
 
@@ -112,7 +113,8 @@ var _ = Describe("Node Operations", func() {
 					"external_ids:ovn-encap-ip=%s "+
 					"external_ids:ovn-remote-probe-interval=%d "+
 					"external_ids:ovn-openflow-probe-interval=%d "+
-					"external_ids:hostname=\"%s\"",
+					"external_ids:hostname=\"%s\" "+
+					"external_ids:ovn-monitor-all=true",
 					nodeIP, interval, ofintval, nodeName),
 			})
 			fexec.AddFakeCmd(&ovntest.ExpectedCmd{