Skip to content

Commit

Permalink
Move libovsdbops package
Browse files Browse the repository at this point in the history 
Move the libovsdbops package out of the
`go-controller/pkg/ovn` directory and into
`go-controller/pkg` since its used by many packages
in the directory.

Signed-off-by: astoycos <[email protected]>
  • Loading branch information
@astoycos
astoycos committed Dec 8, 2021
1 parent 6da3cfb commit 0ecbe76
Show file tree
Hide file tree
Showing 55 changed files with 65 additions and 34 deletions.
2 changes: 1 addition & 1 deletion go-controller/cmd/ovn-kube-util/app/readiness-probe.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
libovsdbclient "github.com/ovn-org/libovsdb/client"

"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/libovsdb"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/libovsdbops"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/libovsdbops"

"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/util"
"github.com/urfave/cli/v2"
Expand Down
3 changes: 2 additions & 1 deletion go-controller/hybrid-overlay/pkg/controller/master.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@ import (
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/config"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/informer"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/kube"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/libovsdbops"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/nbdb"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/libovsdbops"

"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/subnetallocator"
ovntypes "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/types"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/util"
Expand Down
3 changes: 2 additions & 1 deletion go-controller/hybrid-overlay/pkg/controller/master_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,9 @@ import (
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/config"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/informer"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/kube"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/libovsdbops"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/nbdb"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/libovsdbops"

ovntest "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/testing"
libovsdbtest "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/testing/libovsdb"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/types"
Expand Down
3 changes: 2 additions & 1 deletion go-controller/hybrid-overlay/pkg/controller/node_linux.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@ import (
houtil "github.com/ovn-org/ovn-kubernetes/go-controller/hybrid-overlay/pkg/util"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/config"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/kube"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/libovsdbops"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/nbdb"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/libovsdbops"

"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/types"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/util"

Expand Down
0 go-controller/pkg/ovn/libovsdbops/acl.go → go-controller/pkg/libovsdbops/acl.go
View file
File renamed without changes.
0 go-controller/pkg/ovn/libovsdbops/chassis.go → go-controller/pkg/libovsdbops/chassis.go
View file
File renamed without changes.
0 ...r/pkg/ovn/libovsdbops/controller_event.go → ...oller/pkg/libovsdbops/controller_event.go
View file
File renamed without changes.
0 ...ontroller/pkg/ovn/libovsdbops/datapath.go → go-controller/pkg/libovsdbops/datapath.go
View file
File renamed without changes.
0 go-controller/pkg/ovn/libovsdbops/encap.go → go-controller/pkg/libovsdbops/encap.go
View file
File renamed without changes.
0 go-controller/pkg/ovn/libovsdbops/lbgroup.go → go-controller/pkg/libovsdbops/lbgroup.go
View file
File renamed without changes.
0 ...oller/pkg/ovn/libovsdbops/loadbalancer.go → ...ontroller/pkg/libovsdbops/loadbalancer.go
View file
File renamed without changes.
0 ...kg/ovn/libovsdbops/logical_switch_port.go → ...er/pkg/libovsdbops/logical_switch_port.go
View file
File renamed without changes.
0 ...roller/pkg/ovn/libovsdbops/mac_binding.go → go-controller/pkg/libovsdbops/mac_binding.go
View file
File renamed without changes.
0 go-controller/pkg/ovn/libovsdbops/meter.go → go-controller/pkg/libovsdbops/meter.go
View file
File renamed without changes.
0 go-controller/pkg/ovn/libovsdbops/model.go → go-controller/pkg/libovsdbops/model.go
View file
File renamed without changes.
0 ...oller/pkg/ovn/libovsdbops/model_client.go → ...ontroller/pkg/libovsdbops/model_client.go
View file
File renamed without changes.
0 .../pkg/ovn/libovsdbops/model_client_test.go → ...ller/pkg/libovsdbops/model_client_test.go
View file
File renamed without changes.
0 ...troller/pkg/ovn/libovsdbops/named_uuid.go → go-controller/pkg/libovsdbops/named_uuid.go
View file
File renamed without changes.
0 ...ntroller/pkg/ovn/libovsdbops/nb_global.go → go-controller/pkg/libovsdbops/nb_global.go
View file
File renamed without changes.
0 ...er/pkg/ovn/libovsdbops/nbdb_connection.go → ...roller/pkg/libovsdbops/nbdb_connection.go
View file
File renamed without changes.
0 ...ntroller/pkg/ovn/libovsdbops/portgroup.go → go-controller/pkg/libovsdbops/portgroup.go
View file
File renamed without changes.
0 go-controller/pkg/ovn/libovsdbops/router.go → go-controller/pkg/libovsdbops/router.go
View file
File renamed without changes.
0 ...ntroller/pkg/ovn/libovsdbops/sb_global.go → go-controller/pkg/libovsdbops/sb_global.go
View file
File renamed without changes.
0 ...er/pkg/ovn/libovsdbops/sbdb_connection.go → ...roller/pkg/libovsdbops/sbdb_connection.go
View file
File renamed without changes.
0 go-controller/pkg/ovn/libovsdbops/switch.go → go-controller/pkg/libovsdbops/switch.go
View file
File renamed without changes.
0 ...roller/pkg/ovn/libovsdbops/switch_test.go → go-controller/pkg/libovsdbops/switch_test.go
View file
File renamed without changes.
0 ...ontroller/pkg/ovn/libovsdbops/transact.go → go-controller/pkg/libovsdbops/transact.go
View file
File renamed without changes.
3 changes: 2 additions & 1 deletion go-controller/pkg/metrics/master.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@ import (
"github.com/ovn-org/libovsdb/client"
"github.com/ovn-org/libovsdb/model"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/config"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/libovsdbops"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/nbdb"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/libovsdbops"

"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/util"

"github.com/prometheus/client_golang/prometheus"
Expand Down
3 changes: 2 additions & 1 deletion go-controller/pkg/metrics/ovn_db.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@ import (

libovsdbclient "github.com/ovn-org/libovsdb/client"

"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/libovsdbops"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/nbdb"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/libovsdbops"

"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/sbdb"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/util"
"github.com/prometheus/client_golang/prometheus"
Expand Down
3 changes: 2 additions & 1 deletion go-controller/pkg/metrics/ovn_northd.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@ import (

libovsdbclient "github.com/ovn-org/libovsdb/client"

"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/libovsdbops"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/nbdb"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/libovsdbops"

"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/util"

"github.com/prometheus/client_golang/prometheus"
Expand Down
3 changes: 2 additions & 1 deletion go-controller/pkg/node/node.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,9 @@ import (
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/informer"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/kube"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/libovsdb"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/libovsdbops"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/node/controllers/upgrade"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/libovsdbops"

"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/types"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/util"
)
Expand Down
3 changes: 2 additions & 1 deletion go-controller/pkg/node/node_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ import (

"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/config"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/kube/mocks"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/libovsdbops"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/libovsdbops"

"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/sbdb"
ovntest "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/testing"
libovsdbtest "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/testing/libovsdb"
Expand Down
6 changes: 4 additions & 2 deletions go-controller/pkg/ovn/address_set/address_set.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,21 @@ package addressset
import (
"context"
"fmt"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/types"
"net"
"sort"
"strings"

"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/types"

"github.com/pkg/errors"

libovsdbclient "github.com/ovn-org/libovsdb/client"
"github.com/ovn-org/libovsdb/model"
"github.com/ovn-org/libovsdb/ovsdb"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/config"
libovsdbops "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/libovsdbops"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/nbdb"
libovsdbops "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/libovsdbops"

"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/util"

"k8s.io/apimachinery/pkg/util/sets"
Expand Down
3 changes: 2 additions & 1 deletion go-controller/pkg/ovn/controller/services/repair.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ import (

libovsdbclient "github.com/ovn-org/libovsdb/client"
globalconfig "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/config"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/libovsdbops"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/libovsdbops"

ovnlb "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/loadbalancer"

apierrors "k8s.io/apimachinery/pkg/api/errors"
Expand Down
3 changes: 2 additions & 1 deletion go-controller/pkg/ovn/controller/unidling/ovn_event_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ package unidling
import (
"testing"

"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/libovsdbops"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/libovsdbops"

"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/sbdb"

kapi "k8s.io/api/core/v1"
Expand Down
3 changes: 2 additions & 1 deletion go-controller/pkg/ovn/controller/unidling/unidle.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ import (
"time"

libovsdbclient "github.com/ovn-org/libovsdb/client"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/libovsdbops"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/libovsdbops"

"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/util"
v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/types"
Expand Down
3 changes: 2 additions & 1 deletion go-controller/pkg/ovn/egressfirewall.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@ import (

"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/config"
egressfirewallapi "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/crd/egressfirewall/v1"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/libovsdbops"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/nbdb"
addressset "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/address_set"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/libovsdbops"

"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/types"

kapi "k8s.io/api/core/v1"
Expand Down
3 changes: 2 additions & 1 deletion go-controller/pkg/ovn/egressfirewall_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,10 @@ import (

"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/config"
egressfirewallapi "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/crd/egressfirewall/v1"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/libovsdbops"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/nbdb"
addressset "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/address_set"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/libovsdbops"

"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/testing/libovsdb"
libovsdbtest "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/testing/libovsdb"
t "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/types"
Expand Down
3 changes: 2 additions & 1 deletion go-controller/pkg/ovn/egressgw.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@ import (
libovsdbclient "github.com/ovn-org/libovsdb/client"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/config"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/factory"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/libovsdbops"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/nbdb"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/libovsdbops"

"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/types"
ovntypes "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/types"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/util"
Expand Down
3 changes: 2 additions & 1 deletion go-controller/pkg/ovn/egressgw_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@ import (
"strconv"

"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/config"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/libovsdbops"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/nbdb"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/libovsdbops"

libovsdbtest "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/testing/libovsdb"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/types"
ovntypes "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/types"
Expand Down
3 changes: 2 additions & 1 deletion go-controller/pkg/ovn/egressip.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@ import (
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/config"
egressipv1 "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/crd/egressip/v1"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/factory"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/libovsdbops"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/nbdb"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/libovsdbops"

"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/types"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/util"
kapi "k8s.io/api/core/v1"
Expand Down
3 changes: 2 additions & 1 deletion go-controller/pkg/ovn/gateway_cleanup.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@ import (
"strconv"
"strings"

"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/libovsdbops"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/nbdb"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/libovsdbops"

ovnlb "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/loadbalancer"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/sbdb"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/types"
Expand Down
3 changes: 2 additions & 1 deletion go-controller/pkg/ovn/gateway_init.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@ import (
"strings"

"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/config"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/libovsdbops"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/nbdb"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/libovsdbops"

"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/types"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/util"

Expand Down
3 changes: 2 additions & 1 deletion go-controller/pkg/ovn/gateway_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@ import (
"github.com/onsi/gomega"
"github.com/onsi/gomega/format"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/config"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/libovsdbops"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/nbdb"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/libovsdbops"

ovnlb "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/loadbalancer"
ovntest "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/testing"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/testing/libovsdb"
Expand Down
3 changes: 2 additions & 1 deletion go-controller/pkg/ovn/gress_policy.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,11 @@ import (

"github.com/ovn-org/libovsdb/client"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/config"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/libovsdbops"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/nbdb"
addressset "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/address_set"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/gateway"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/libovsdbops"

"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/types"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/util"

Expand Down
3 changes: 2 additions & 1 deletion go-controller/pkg/ovn/loadbalancer/lb_cache.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ import (
"sync"

libovsdbclient "github.com/ovn-org/libovsdb/client"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/libovsdbops"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/libovsdbops"

"k8s.io/apimachinery/pkg/util/sets"
)

Expand Down
2 changes: 1 addition & 1 deletion go-controller/pkg/ovn/loadbalancer/loadbalancer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (

libovsdbclient "github.com/ovn-org/libovsdb/client"
libovsdb "github.com/ovn-org/libovsdb/ovsdb"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/libovsdbops"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/nbdb"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/libovsdbops"

"k8s.io/klog/v2"
)
Expand Down
3 changes: 2 additions & 1 deletion go-controller/pkg/ovn/master.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,10 @@ import (
hocontroller "github.com/ovn-org/ovn-kubernetes/go-controller/hybrid-overlay/pkg/controller"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/config"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/informer"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/libovsdbops"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/metrics"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/nbdb"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/libovsdbops"

ovnlb "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/loadbalancer"
lsm "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/logical_switch_manager"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/types"
Expand Down
3 changes: 2 additions & 1 deletion go-controller/pkg/ovn/ovn.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,13 @@ import (
egressipv1 "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/crd/egressip/v1"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/factory"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/kube"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/libovsdbops"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/metrics"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/nbdb"
addressset "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/address_set"
svccontroller "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/controller/services"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/controller/unidling"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/libovsdbops"

lsm "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/logical_switch_manager"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/subnetallocator"
ovntypes "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/types"
Expand Down
5 changes: 3 additions & 2 deletions go-controller/pkg/ovn/pods.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@ package ovn
import (
"context"
"fmt"
ovntypes "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/types"
"net"
"time"

ovntypes "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/types"

"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/config"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/metrics"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/ipallocator"
Expand All @@ -20,8 +21,8 @@ import (
libovsdbclient "github.com/ovn-org/libovsdb/client"
"github.com/ovn-org/libovsdb/model"
"github.com/ovn-org/libovsdb/ovsdb"
libovsdbops "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/libovsdbops"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/nbdb"
libovsdbops "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/libovsdbops"
)

func (oc *Controller) syncPods(pods []interface{}) {
Expand Down
3 changes: 2 additions & 1 deletion go-controller/pkg/ovn/pods_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,9 @@ import (
"github.com/onsi/ginkgo"
"github.com/onsi/gomega"

libovsdbops "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/libovsdbops"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/nbdb"
libovsdbops "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/libovsdbops"

libovsdbtest "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/testing/libovsdb"
)

Expand Down
3 changes: 2 additions & 1 deletion go-controller/pkg/ovn/policy.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@ import (
ovsdb "github.com/ovn-org/libovsdb/ovsdb"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/config"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/factory"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/libovsdbops"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/nbdb"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/libovsdbops"

"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/types"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/util"
kapi "k8s.io/api/core/v1"
Expand Down
3 changes: 2 additions & 1 deletion go-controller/pkg/ovn/policy_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,10 @@ import (

libovsdbclient "github.com/ovn-org/libovsdb/client"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/config"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/libovsdbops"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/nbdb"
addressset "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/address_set"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/libovsdbops"

ovntest "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/testing"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/testing/libovsdb"
libovsdbtest "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/testing/libovsdb"
Expand Down
3 changes: 2 additions & 1 deletion go-controller/pkg/util/ovn.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ import (

libovsdbclient "github.com/ovn-org/libovsdb/client"

"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/libovsdbops"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/libovsdbops"

"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/sbdb"
)

Expand Down
3 changes: 2 additions & 1 deletion go-controller/pkg/util/util.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@ import (
libovsdbclient "github.com/ovn-org/libovsdb/client"

"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/config"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/libovsdbops"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/nbdb"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/libovsdbops"

"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/types"

"github.com/urfave/cli/v2"
Expand Down

0 comments on commit 0ecbe76

Please sign in to comment.