Skip to content

Commit 5bc239d

Browse files
tssuryatssurya
committed
Revert "fix lint"
This reverts commit 4f2f5a1.
1 parent 3d15e9f commit 5bc239d

13 files changed

+54
-60
lines changed

‎go-controller/pkg/clustermanager/status_manager/networkqos_manager.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ import (
44
"context"
55
"strings"
66

7-
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
8-
97
networkqosapi "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/crd/networkqos/v1alpha1"
108
networkqosapply "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/crd/networkqos/v1alpha1/apis/applyconfiguration/networkqos/v1alpha1"
119
networkqosclientset "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/crd/networkqos/v1alpha1/apis/clientset/versioned"
1210
networkqoslisters "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/crd/networkqos/v1alpha1/apis/listers/networkqos/v1alpha1"
1311
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/types"
12+
13+
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1414
)
1515

1616
type networkQoSManager struct {

‎go-controller/pkg/clustermanager/status_manager/status_manager_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import (
77
"sync/atomic"
88

99
corev1 "k8s.io/api/core/v1"
10-
networkingv1 "k8s.io/api/networking/v1"
1110
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1211
"k8s.io/apimachinery/pkg/runtime"
1312
"k8s.io/apimachinery/pkg/util/sets"
@@ -30,6 +29,7 @@ import (
3029

3130
. "github.com/onsi/ginkgo/v2"
3231
. "github.com/onsi/gomega"
32+
networkingv1 "k8s.io/api/networking/v1"
3333
)
3434

3535
func getNodeWithZone(nodeName, zoneName string) *corev1.Node {

‎go-controller/pkg/factory/factory_test.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,12 @@ import (
3838
egressqosfake "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/crd/egressqos/v1/apis/clientset/versioned/fake"
3939
egressservice "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/crd/egressservice/v1"
4040
egressservicefake "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/crd/egressservice/v1/apis/clientset/versioned/fake"
41-
networkqos "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/crd/networkqos/v1alpha1"
42-
networkqosfake "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/crd/networkqos/v1alpha1/apis/clientset/versioned/fake"
4341
crdtypes "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/crd/types"
4442
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/util"
4543

44+
networkqos "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/crd/networkqos/v1alpha1"
45+
networkqosfake "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/crd/networkqos/v1alpha1/apis/clientset/versioned/fake"
46+
4647
. "github.com/onsi/ginkgo/v2"
4748
. "github.com/onsi/gomega"
4849
)
@@ -2164,7 +2165,7 @@ var _ = Describe("Watch Factory Operations", func() {
21642165
networkQoS := obj.(*networkqos.NetworkQoS)
21652166
Expect(reflect.DeepEqual(networkQoS, added)).To(BeTrue())
21662167
},
2167-
UpdateFunc: func(_, new interface{}) {
2168+
UpdateFunc: func(old, new interface{}) {
21682169
newNetworkQoS := new.(*networkqos.NetworkQoS)
21692170
Expect(reflect.DeepEqual(newNetworkQoS, added)).To(BeTrue())
21702171
Expect(newNetworkQoS.Spec.Egress[0].DSCP).To(Equal(42))

‎go-controller/pkg/ovn/base_network_controller.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ import (
99
"sync"
1010
"time"
1111

12-
nadinformerv1 "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/client/informers/externalversions/k8s.cni.cncf.io/v1"
13-
1412
corev1 "k8s.io/api/core/v1"
1513
knet "k8s.io/api/networking/v1"
1614
apierrors "k8s.io/apimachinery/pkg/api/errors"
@@ -24,9 +22,9 @@ import (
2422
"k8s.io/klog/v2"
2523
utilnet "k8s.io/utils/net"
2624

25+
nadinformerv1 "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/client/informers/externalversions/k8s.cni.cncf.io/v1"
2726
libovsdbclient "github.com/ovn-org/libovsdb/client"
2827
"github.com/ovn-org/libovsdb/ovsdb"
29-
3028
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/allocator/pod"
3129
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/config"
3230
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/factory"

‎go-controller/pkg/ovn/controller/network_qos/metrics.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
package networkqos
22

33
import (
4-
"github.com/prometheus/client_golang/prometheus"
5-
64
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/metrics"
5+
"github.com/prometheus/client_golang/prometheus"
76
)
87

98
// Metrics to be exposed

‎go-controller/pkg/ovn/controller/network_qos/network_qos.go

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ import (
66
"sync"
77
"time"
88

9-
nadv1 "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/apis/k8s.cni.cncf.io/v1"
10-
119
corev1 "k8s.io/api/core/v1"
1210
apierrors "k8s.io/apimachinery/pkg/api/errors"
1311
"k8s.io/apimachinery/pkg/api/meta"
@@ -19,6 +17,7 @@ import (
1917
"k8s.io/klog/v2"
2018
"k8s.io/utils/ptr"
2119

20+
nadv1 "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/apis/k8s.cni.cncf.io/v1"
2221
networkqosapi "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/crd/networkqos/v1alpha1"
2322
nqosapiapply "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/crd/networkqos/v1alpha1/apis/applyconfiguration/networkqos/v1alpha1"
2423
crdtypes "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/crd/types"
@@ -71,7 +70,7 @@ func (c *Controller) syncNetworkQoS(key string) error {
7170
}
7271
if nqos == nil {
7372
klog.V(6).Infof("%s - NetworkQoS %s no longer exists.", c.controllerName, key)
74-
return c.nqosCache.DoWithLock(key, func(_ string) error {
73+
return c.nqosCache.DoWithLock(key, func(nqosKey string) error {
7574
return c.clearNetworkQos(nqosNamespace, nqosName)
7675
})
7776
}
@@ -80,14 +79,14 @@ func (c *Controller) syncNetworkQoS(key string) error {
8079
return err
8180
} else if !networkManagedByMe {
8281
// maybe NetworkAttachmentName has been changed from this one to other value, try cleanup anyway
83-
return c.nqosCache.DoWithLock(key, func(_ string) error {
82+
return c.nqosCache.DoWithLock(key, func(nqosKey string) error {
8483
return c.clearNetworkQos(nqosNamespace, nqosName)
8584
})
8685
}
8786

8887
klog.V(5).Infof("%s - Processing NetworkQoS %s/%s", c.controllerName, nqos.Namespace, nqos.Name)
8988
// at this stage the NQOS exists in the cluster
90-
return c.nqosCache.DoWithLock(key, func(_ string) error {
89+
return c.nqosCache.DoWithLock(key, func(nqosKey string) error {
9190
// save key to avoid racing
9291
c.nqosCache.Store(key, nil)
9392
if err = c.ensureNetworkQos(nqos); err != nil {

‎go-controller/pkg/ovn/controller/network_qos/network_qos_controller.go

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,7 @@ import (
66
"sync"
77
"time"
88

9-
nadinformerv1 "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/client/informers/externalversions/k8s.cni.cncf.io/v1"
10-
nadlisterv1 "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/client/listers/k8s.cni.cncf.io/v1"
11-
12-
corev1 "k8s.io/api/core/v1"
9+
v1 "k8s.io/api/core/v1"
1310
"k8s.io/apimachinery/pkg/labels"
1411
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
1512
"k8s.io/apimachinery/pkg/util/wait"
@@ -22,6 +19,8 @@ import (
2219

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

22+
nadinformerv1 "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/client/informers/externalversions/k8s.cni.cncf.io/v1"
23+
nadlisterv1 "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/client/listers/k8s.cni.cncf.io/v1"
2524
networkqosapi "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/crd/networkqos/v1alpha1"
2625
networkqosclientset "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/crd/networkqos/v1alpha1/apis/clientset/versioned"
2726
networkqosinformer "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/crd/networkqos/v1alpha1/apis/informers/externalversions/networkqos/v1alpha1"
@@ -62,7 +61,7 @@ type Controller struct {
6261
// we consider it remote - this is ok for this controller as this variable is only used to
6362
// determine if we need to add pod's port to port group or not - future updates should
6463
// take care of reconciling the state of the cluster
65-
isPodScheduledinLocalZone func(*corev1.Pod) bool
64+
isPodScheduledinLocalZone func(*v1.Pod) bool
6665
// store's the name of the zone that this controller belongs to
6766
zone string
6867

@@ -106,7 +105,7 @@ func NewController(
106105
nodeInformer corev1informers.NodeInformer,
107106
nadInformer nadinformerv1.NetworkAttachmentDefinitionInformer,
108107
addressSetFactory addressset.AddressSetFactory,
109-
isPodScheduledinLocalZone func(*corev1.Pod) bool,
108+
isPodScheduledinLocalZone func(*v1.Pod) bool,
110109
zone string) (*Controller, error) {
111110

112111
c := &Controller{
@@ -356,8 +355,8 @@ func (c *Controller) onNQOSNamespaceAdd(obj interface{}) {
356355

357356
// onNQOSNamespaceUpdate queues the namespace for processing.
358357
func (c *Controller) onNQOSNamespaceUpdate(oldObj, newObj interface{}) {
359-
oldNamespace := oldObj.(*corev1.Namespace)
360-
newNamespace := newObj.(*corev1.Namespace)
358+
oldNamespace := oldObj.(*v1.Namespace)
359+
newNamespace := newObj.(*v1.Namespace)
361360

362361
// don't process resync or objects that are marked for deletion
363362
if oldNamespace.ResourceVersion == newNamespace.ResourceVersion ||
@@ -402,8 +401,8 @@ func (c *Controller) onNQOSPodAdd(obj interface{}) {
402401

403402
// onNQOSPodUpdate queues the pod for processing.
404403
func (c *Controller) onNQOSPodUpdate(oldObj, newObj interface{}) {
405-
oldPod := oldObj.(*corev1.Pod)
406-
newPod := newObj.(*corev1.Pod)
404+
oldPod := oldObj.(*v1.Pod)
405+
newPod := newObj.(*v1.Pod)
407406

408407
// don't process resync or objects that are marked for deletion
409408
if oldPod.ResourceVersion == newPod.ResourceVersion ||
@@ -448,8 +447,8 @@ func (c *Controller) onNQOSPodDelete(obj interface{}) {
448447

449448
// onNQOSNodeUpdate queues the node for processing.
450449
func (c *Controller) onNQOSNodeUpdate(oldObj, newObj interface{}) {
451-
oldNode := oldObj.(*corev1.Node)
452-
newNode := newObj.(*corev1.Node)
450+
oldNode := oldObj.(*v1.Node)
451+
newNode := newObj.(*v1.Node)
453452

454453
// don't process resync or objects that are marked for deletion
455454
if oldNode.ResourceVersion == newNode.ResourceVersion ||

‎go-controller/pkg/ovn/controller/network_qos/network_qos_namespace.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"sync"
66
"time"
77

8-
corev1 "k8s.io/api/core/v1"
8+
v1 "k8s.io/api/core/v1"
99
apierrors "k8s.io/apimachinery/pkg/api/errors"
1010
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
1111
"k8s.io/klog/v2"
@@ -108,7 +108,7 @@ func (c *Controller) clearNamespaceForNQOS(namespace string, nqosState *networkQ
108108

109109
// setNamespaceForNQOS will handle the logic for figuring out if the provided namespace name
110110
// has pods that need to populate or removed from the address sets of the network qoses.
111-
func (c *Controller) setNamespaceForNQOS(namespace *corev1.Namespace, nqosState *networkQoSState) error {
111+
func (c *Controller) setNamespaceForNQOS(namespace *v1.Namespace, nqosState *networkQoSState) error {
112112
for _, rule := range nqosState.EgressRules {
113113
if rule.Classifier == nil {
114114
continue

‎go-controller/pkg/ovn/controller/network_qos/network_qos_node.go

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,14 @@ import (
55
"sync"
66
"time"
77

8-
corev1 "k8s.io/api/core/v1"
8+
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/types"
9+
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/util"
10+
v1 "k8s.io/api/core/v1"
911
apierrors "k8s.io/apimachinery/pkg/api/errors"
1012
"k8s.io/apimachinery/pkg/labels"
1113
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
1214
"k8s.io/client-go/tools/cache"
1315
"k8s.io/klog/v2"
14-
15-
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/types"
16-
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/util"
1716
)
1817

1918
func (c *Controller) processNextNQOSNodeWorkItem(wg *sync.WaitGroup) bool {
@@ -103,12 +102,12 @@ func (c *Controller) syncNetworkQoSNode(key string) error {
103102
return nil
104103
}
105104

106-
func (c *Controller) getPodsByNode(nodeName string) ([]*corev1.Pod, error) {
105+
func (c *Controller) getPodsByNode(nodeName string) ([]*v1.Pod, error) {
107106
pods, err := c.nqosPodLister.List(labels.Everything())
108107
if err != nil {
109108
return nil, fmt.Errorf("failed to list pods: %w", err)
110109
}
111-
podsByNode := []*corev1.Pod{}
110+
podsByNode := []*v1.Pod{}
112111
for _, pod := range pods {
113112
if util.PodScheduled(pod) && !util.PodWantsHostNetwork(pod) && pod.Spec.NodeName == nodeName {
114113
podsByNode = append(podsByNode, pod)
@@ -118,7 +117,7 @@ func (c *Controller) getPodsByNode(nodeName string) ([]*corev1.Pod, error) {
118117
}
119118

120119
// isNodeInLocalZone returns whether the provided node is in a zone local to the zone controller
121-
func (c *Controller) isNodeInLocalZone(node *corev1.Node) bool {
120+
func (c *Controller) isNodeInLocalZone(node *v1.Node) bool {
122121
return util.GetNodeZone(node) == c.zone
123122
}
124123

‎go-controller/pkg/ovn/controller/network_qos/network_qos_ovnnb.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"strconv"
88

99
libovsdbclient "github.com/ovn-org/libovsdb/client"
10-
"github.com/ovn-org/libovsdb/ovsdb"
10+
libovsdb "github.com/ovn-org/libovsdb/ovsdb"
1111

1212
libovsdbops "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/libovsdb/ops"
1313
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/nbdb"
@@ -59,7 +59,7 @@ func (c *Controller) addQoSToLogicalSwitch(qosState *networkQoSState, switchName
5959
}
6060
qoses = append(qoses, qos)
6161
}
62-
ops := []ovsdb.Operation{}
62+
ops := []libovsdb.Operation{}
6363
ops, err = libovsdbops.CreateOrUpdateQoSesOps(c.nbClient, ops, qoses...)
6464
if err != nil {
6565
return fmt.Errorf("failed to create QoS operations for %s/%s: %w", qosState.namespace, qosState.name, err)
@@ -94,7 +94,7 @@ func (c *Controller) removeQoSFromLogicalSwitches(qosState *networkQoSState, swi
9494
if err != nil {
9595
return fmt.Errorf("failed to look up QoSes for %s/%s: %v", qosState.namespace, qosState.name, err)
9696
}
97-
unbindQoSOps := []ovsdb.Operation{}
97+
unbindQoSOps := []libovsdb.Operation{}
9898
// remove qos rules from logical switches
9999
for _, lsName := range switchNames {
100100
ops, err := libovsdbops.RemoveQoSesFromLogicalSwitchOps(c.nbClient, nil, lsName, qoses...)
@@ -159,7 +159,7 @@ func (c *Controller) cleanupStaleOvnObjects(qosState *networkQoSState) error {
159159
}
160160
// remove stale qos rules from logical switches
161161
for lsName, qoses := range staleSwitchQoSMap {
162-
var switchOps []ovsdb.Operation
162+
var switchOps []libovsdb.Operation
163163
switchOps, err = libovsdbops.RemoveQoSesFromLogicalSwitchOps(c.nbClient, switchOps, lsName, qoses...)
164164
if err != nil {
165165
return fmt.Errorf("failed to get ops to remove stale QoSes from switches %s for NetworkQoS %s/%s: %w", lsName, qosState.namespace, qosState.name, err)
@@ -216,7 +216,7 @@ func (c *Controller) deleteOvnQoSes(qoses []*nbdb.QoS) error {
216216
switchQoSMap[ls.Name] = qosList
217217
}
218218
}
219-
unbindQoSOps := []ovsdb.Operation{}
219+
unbindQoSOps := []libovsdb.Operation{}
220220
// remove qos rules from logical switches
221221
for lsName, qoses := range switchQoSMap {
222222
ops, err := libovsdbops.RemoveQoSesFromLogicalSwitchOps(c.nbClient, nil, lsName, qoses...)
@@ -259,7 +259,7 @@ func (c *Controller) deleteAddressSet(qosName string) error {
259259
// 1. find address sets owned by NetworkQoS
260260
// 2. get address sets in use
261261
// 3. compare and identify those not in use
262-
func (c *Controller) findStaleAddressSets(qosState *networkQoSState) ([]ovsdb.Operation, error) {
262+
func (c *Controller) findStaleAddressSets(qosState *networkQoSState) ([]libovsdb.Operation, error) {
263263
staleAddressSets := []*nbdb.AddressSet{}
264264
addrsets, err := libovsdbops.FindAddressSetsWithPredicate(c.nbClient, func(item *nbdb.AddressSet) bool {
265265
return item.ExternalIDs[libovsdbops.OwnerControllerKey.String()] == c.controllerName &&

‎go-controller/pkg/ovn/controller/network_qos/network_qos_pod.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"sync"
77
"time"
88

9-
corev1 "k8s.io/api/core/v1"
9+
v1 "k8s.io/api/core/v1"
1010
apierrors "k8s.io/apimachinery/pkg/api/errors"
1111
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
1212
"k8s.io/client-go/tools/cache"
@@ -142,7 +142,7 @@ func (c *Controller) clearPodForNQOS(namespace, name string, nqosState *networkQ
142142
// setPodForNQOS will check if the pod meets source selector or dest selector
143143
// - match source: add the ip to source address set, bind qos rule to the switch
144144
// - match dest: add the ip to the destination address set
145-
func (c *Controller) setPodForNQOS(pod *corev1.Pod, nqosState *networkQoSState, namespace *corev1.Namespace) error {
145+
func (c *Controller) setPodForNQOS(pod *v1.Pod, nqosState *networkQoSState, namespace *v1.Namespace) error {
146146
addresses, err := getPodAddresses(pod, c.NetInfo)
147147
if err == nil && len(addresses) == 0 {
148148
// pod either is not attached to this network, or hasn't been annotated with addresses yet, return without retry
@@ -174,7 +174,7 @@ func (c *Controller) setPodForNQOS(pod *corev1.Pod, nqosState *networkQoSState,
174174
return reconcilePodForDestinations(nqosState, namespace, pod, addresses)
175175
}
176176

177-
func reconcilePodForDestinations(nqosState *networkQoSState, podNs *corev1.Namespace, pod *corev1.Pod, addresses []string) error {
177+
func reconcilePodForDestinations(nqosState *networkQoSState, podNs *v1.Namespace, pod *v1.Pod, addresses []string) error {
178178
fullPodName := joinMetaNamespaceAndName(pod.Namespace, pod.Name)
179179
for _, rule := range nqosState.EgressRules {
180180
for index, dest := range rule.Classifier.Destinations {

‎go-controller/pkg/ovn/controller/network_qos/network_qos_test.go

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ import (
99
"testing"
1010
"time"
1111

12+
. "github.com/onsi/ginkgo/v2"
13+
. "github.com/onsi/gomega"
14+
1215
corev1 "k8s.io/api/core/v1"
1316
networkingv1 "k8s.io/api/networking/v1"
1417
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -29,9 +32,6 @@ import (
2932
libovsdbtest "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/testing/libovsdb"
3033
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/types"
3134
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/util"
32-
33-
. "github.com/onsi/ginkgo/v2"
34-
. "github.com/onsi/gomega"
3535
)
3636

3737
func init() {
@@ -559,8 +559,7 @@ var _ = Describe("NetworkQoS Controller", func() {
559559
libovsdbops.ObjectNameKey: nqosNamespace,
560560
})
561561
addrset, err := defaultAddrsetFactory.EnsureAddressSet(dbIDs)
562-
Expect(err).NotTo(HaveOccurred())
563-
err = addrset.AddAddresses([]string{"10.194.188.4"})
562+
addrset.AddAddresses([]string{"10.194.188.4"})
564563
Expect(err).NotTo(HaveOccurred())
565564
nqosWithoutSrcSelector := &nqostype.NetworkQoS{
566565
ObjectMeta: metav1.ObjectMeta{
@@ -919,7 +918,7 @@ func createTestNBGlobal(nbClient libovsdbclient.Client, zone string) error {
919918
}
920919

921920
func deleteTestNBGlobal(nbClient libovsdbclient.Client) error {
922-
p := func(_ *nbdb.NBGlobal) bool {
921+
p := func(nbGlobal *nbdb.NBGlobal) bool {
923922
return true
924923
}
925924
ops, err := nbClient.WhereCache(p).Delete()

0 commit comments

Comments
 (0)