Merge pull request ovn-kubernetes#2601 from trozet/bump_libovsdb

bump libovsdb
ricky-rav · Oct 25, 2021 · c255962 · c255962
2 parents 42639ad + 7df9969
commit c255962
Show file tree

Hide file tree

Showing 35 changed files with 890 additions and 636 deletions.
diff --git a/go-controller/go.mod b/go-controller/go.mod
@@ -23,7 +23,7 @@ require (
 	github.com/mitchellh/copystructure v1.2.0
 	github.com/onsi/ginkgo v1.16.4
 	github.com/onsi/gomega v1.14.0
-	github.com/ovn-org/libovsdb v0.6.1-0.20211014201246-28345b9aeccf
+	github.com/ovn-org/libovsdb v0.6.1-0.20211025161502-80be4acc6773
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus/client_golang v1.11.0
 	github.com/spf13/afero v1.4.1

diff --git a/go-controller/go.sum b/go-controller/go.sum
@@ -349,6 +349,8 @@ github.com/opencontainers/selinux v1.8.2/go.mod h1:MUIHuUEvKB1wtJjQdOyYRgOnLD2xA
 github.com/ory/dockertest/v3 v3.8.0/go.mod h1:9zPATATlWQru+ynXP+DytBQrsXV7Tmlx7K86H6fQaDo=
 github.com/ovn-org/libovsdb v0.6.1-0.20211014201246-28345b9aeccf h1:JgpRUwUCOU+++1LLNHhBWSsAmWQ/mK4ALyeO2veR7mA=
 github.com/ovn-org/libovsdb v0.6.1-0.20211014201246-28345b9aeccf/go.mod h1:aLvY7gPs/vLyJXF+PpZzvWlR5LB4QNJvBYIQMskJLZk=
+github.com/ovn-org/libovsdb v0.6.1-0.20211025161502-80be4acc6773 h1:NJgd0Pv3+44oMsDhF8iV53kXJ5EDmQHeCwxWQf3pS4c=
+github.com/ovn-org/libovsdb v0.6.1-0.20211025161502-80be4acc6773/go.mod h1:aLvY7gPs/vLyJXF+PpZzvWlR5LB4QNJvBYIQMskJLZk=
 github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=

diff --git a/go-controller/pkg/libovsdb/libovsdb.go b/go-controller/pkg/libovsdb/libovsdb.go
@@ -28,7 +28,7 @@ const (
 // newClient creates a new client object given the provided config
 // the stopCh is required to ensure the goroutine for ssl cert
 // update is not leaked
-func newClient(cfg config.OvnAuthConfig, dbModel *model.DBModel, stopCh <-chan struct{}) (client.Client, error) {
+func newClient(cfg config.OvnAuthConfig, dbModel *model.ClientDBModel, stopCh <-chan struct{}) (client.Client, error) {
 	logger := klogr.New()
 	options := []client.Option{
 		client.WithReconnect(OVSDBTimeout, &backoff.ZeroBackOff{}),
@@ -98,7 +98,7 @@ func NewNBClientWithConfig(cfg config.OvnAuthConfig, stopCh <-chan struct{}) (cl
 	return newClientWithMonitor(cfg, stopCh, dbModel)
 }
 
-func newClientWithMonitor(cfg config.OvnAuthConfig, stopCh <-chan struct{}, dbModel *model.DBModel) (client.Client, error) {
+func newClientWithMonitor(cfg config.OvnAuthConfig, stopCh <-chan struct{}, dbModel *model.ClientDBModel) (client.Client, error) {
 	c, err := newClient(cfg, dbModel, stopCh)
 	if err != nil {
 		return nil, err

diff --git a/go-controller/pkg/nbdb/acl.go b/go-controller/pkg/nbdb/acl.go
diff --git a/go-controller/pkg/nbdb/bfd.go b/go-controller/pkg/nbdb/bfd.go
diff --git a/go-controller/pkg/nbdb/load_balancer.go b/go-controller/pkg/nbdb/load_balancer.go
diff --git a/go-controller/pkg/nbdb/logical_router_static_route.go b/go-controller/pkg/nbdb/logical_router_static_route.go