Skip to content

Commit 808d207

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request openshift#1094 from SchSeba/merge-bot-master
Merge https://github.com/k8snetworkplumbingwg/sriov-network-operator:master into main
2 parents 2f99a8b + 69e00f4 commit 808d207

File tree

13 files changed

+39
-32
lines changed

13 files changed

+39
-32
lines changed

‎api/v1/helper.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import (
66
"fmt"
77
"os"
88
"path/filepath"
9-
"reflect"
109
"regexp"
1110
"slices"
1211
"sort"
@@ -15,6 +14,7 @@ import (
1514
"time"
1615

1716
corev1 "k8s.io/api/core/v1"
17+
"k8s.io/apimachinery/pkg/api/equality"
1818
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1919
uns "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
2020
intstrutil "k8s.io/apimachinery/pkg/util/intstr"
@@ -952,7 +952,7 @@ func GenerateBridgeName(iface *InterfaceExt) string {
952952

953953
// NeedToUpdateBridges returns true if bridge for the host requires update
954954
func NeedToUpdateBridges(bridgeSpec, bridgeStatus *Bridges) bool {
955-
return !reflect.DeepEqual(bridgeSpec, bridgeStatus)
955+
return !equality.Semantic.DeepEqual(bridgeSpec, bridgeStatus)
956956
}
957957

958958
// SetKeepUntilTime sets an annotation to hold the "keep until time" for the node’s state.

‎bundle/manifests/sriov-network-operator.clusterserviceversion.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ metadata:
100100
categories: Networking
101101
certified: "false"
102102
containerImage: quay.io/openshift/origin-sriov-network-operator:4.19
103-
createdAt: "2025-05-11T23:49:34Z"
103+
createdAt: "2025-05-27T23:48:49Z"
104104
description: An operator for configuring SR-IOV components and initializing SRIOV
105105
network devices in Openshift cluster.
106106
features.operators.openshift.io/cnf: "false"

‎controllers/generic_network_controller.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ package controllers
1818

1919
import (
2020
"context"
21-
"reflect"
2221

2322
netattdefv1 "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/apis/k8s.cni.cncf.io/v1"
2423
corev1 "k8s.io/api/core/v1"
24+
"k8s.io/apimachinery/pkg/api/equality"
2525
"k8s.io/apimachinery/pkg/api/errors"
2626
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2727
uns "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
@@ -180,7 +180,7 @@ func (r *genericNetworkReconciler) Reconcile(ctx context.Context, req ctrl.Reque
180180
}
181181
} else {
182182
reqLogger.Info("NetworkAttachmentDefinition CR already exist")
183-
if !reflect.DeepEqual(found.Spec, netAttDef.Spec) || !reflect.DeepEqual(found.GetAnnotations(), netAttDef.GetAnnotations()) {
183+
if !equality.Semantic.DeepEqual(found.Spec, netAttDef.Spec) || !equality.Semantic.DeepEqual(found.GetAnnotations(), netAttDef.GetAnnotations()) {
184184
reqLogger.Info("Update NetworkAttachmentDefinition CR", "Namespace", netAttDef.Namespace, "Name", netAttDef.Name)
185185
netAttDef.SetResourceVersion(found.GetResourceVersion())
186186
err = r.Update(ctx, netAttDef)

‎controllers/sriovnetworknodepolicy_controller.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import (
2121
"encoding/json"
2222
"fmt"
2323
"os"
24-
"reflect"
2524
"sort"
2625
"strconv"
2726
"strings"
@@ -182,7 +181,7 @@ func (r *SriovNetworkNodePolicyReconciler) SetupWithManager(mgr ctrl.Manager) er
182181
qHandler(w)
183182
},
184183
UpdateFunc: func(c context.Context, e event.TypedUpdateEvent[client.Object], w workqueue.TypedRateLimitingInterface[reconcile.Request]) {
185-
if reflect.DeepEqual(e.ObjectOld.GetLabels(), e.ObjectNew.GetLabels()) {
184+
if equality.Semantic.DeepEqual(e.ObjectOld.GetLabels(), e.ObjectNew.GetLabels()) {
186185
return
187186
}
188187
log.Log.WithName("SriovNetworkNodePolicy").
@@ -479,7 +478,7 @@ func (r *SriovNetworkNodePolicyReconciler) syncSriovNetworkNodeState(ctx context
479478
// Note(adrianc): we check same ownerReferences since SriovNetworkNodeState
480479
// was owned by a default SriovNetworkNodePolicy. if we encounter a descripancy
481480
// we need to update.
482-
if !keepUntilAnnotationUpdated && reflect.DeepEqual(newVersion.OwnerReferences, found.OwnerReferences) &&
481+
if !keepUntilAnnotationUpdated && equality.Semantic.DeepEqual(newVersion.OwnerReferences, found.OwnerReferences) &&
483482
equality.Semantic.DeepEqual(newVersion.Spec, found.Spec) {
484483
logger.V(1).Info("SriovNetworkNodeState did not change, not updating")
485484
return nil

‎controllers/sriovnetworkpoolconfig_controller.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ import (
44
"context"
55
"encoding/json"
66
"fmt"
7-
"reflect"
87

98
mcfgv1 "github.com/openshift/api/machineconfiguration/v1"
109

10+
"k8s.io/apimachinery/pkg/api/equality"
1111
"k8s.io/apimachinery/pkg/api/errors"
1212
"k8s.io/apimachinery/pkg/runtime"
1313
"k8s.io/apimachinery/pkg/types"
@@ -196,7 +196,7 @@ func (r *SriovNetworkPoolConfigReconciler) syncOvsHardwareOffloadMachineConfigs(
196196
// ignition and compare.
197197
json.Unmarshal(foundMC.Spec.Config.Raw, &foundIgn)
198198
json.Unmarshal(mc.Spec.Config.Raw, &renderedIgn)
199-
if !reflect.DeepEqual(foundIgn, renderedIgn) {
199+
if !equality.Semantic.DeepEqual(foundIgn, renderedIgn) {
200200
logger.Info("MachineConfig already exists, updating")
201201
mc.SetResourceVersion(foundMC.GetResourceVersion())
202202
err = r.Update(ctx, mc)

‎manifests/stable/sriov-network-operator.clusterserviceversion.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ metadata:
100100
categories: Networking
101101
certified: "false"
102102
containerImage: quay.io/openshift/origin-sriov-network-operator:4.19
103-
createdAt: "2025-05-11T23:49:34Z"
103+
createdAt: "2025-05-27T23:48:49Z"
104104
description: An operator for configuring SR-IOV components and initializing SRIOV
105105
network devices in Openshift cluster.
106106
features.operators.openshift.io/cnf: "false"

‎pkg/daemon/config.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ package daemon
22

33
import (
44
"context"
5-
"reflect"
65

6+
"k8s.io/apimachinery/pkg/api/equality"
77
"k8s.io/apimachinery/pkg/api/errors"
88
ctrl "sigs.k8s.io/controller-runtime"
99
"sigs.k8s.io/controller-runtime/pkg/client"
@@ -48,7 +48,7 @@ func (oc *OperatorConfigNodeReconcile) Reconcile(ctx context.Context, req ctrl.R
4848
log.Log.Info("Set Disable Drain", "value", vars.DisableDrain)
4949
}
5050

51-
if !reflect.DeepEqual(oc.latestFeatureGates, operatorConfig.Spec.FeatureGates) {
51+
if !equality.Semantic.DeepEqual(oc.latestFeatureGates, operatorConfig.Spec.FeatureGates) {
5252
vars.FeatureGate.Init(operatorConfig.Spec.FeatureGates)
5353
oc.latestFeatureGates = operatorConfig.Spec.FeatureGates
5454
log.Log.Info("Updated featureGates", "featureGates", vars.FeatureGate.String())

‎pkg/daemon/status.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package daemon
33
import (
44
"context"
55
"fmt"
6-
"reflect"
76

7+
"k8s.io/apimachinery/pkg/api/equality"
88
"k8s.io/client-go/util/retry"
99
"sigs.k8s.io/controller-runtime/pkg/client"
1010
"sigs.k8s.io/controller-runtime/pkg/log"
@@ -66,12 +66,12 @@ func (dn *NodeReconciler) shouldUpdateStatus(current, desiredNodeState *sriovnet
6666
}
6767

6868
// check for bridges
69-
if !reflect.DeepEqual(current.Status.Bridges, desiredNodeState.Status.Bridges) {
69+
if !equality.Semantic.DeepEqual(current.Status.Bridges, desiredNodeState.Status.Bridges) {
7070
return true
7171
}
7272

7373
// check for system
74-
if !reflect.DeepEqual(current.Status.System, desiredNodeState.Status.System) {
74+
if !equality.Semantic.DeepEqual(current.Status.System, desiredNodeState.Status.System) {
7575
return true
7676
}
7777

@@ -89,7 +89,7 @@ func (dn *NodeReconciler) shouldUpdateStatus(current, desiredNodeState *sriovnet
8989
d[idx].VFs = nil
9090
c[idx].VFs = nil
9191

92-
if !reflect.DeepEqual(d[idx], c[idx]) {
92+
if !equality.Semantic.DeepEqual(d[idx], c[idx]) {
9393
return true
9494
}
9595
}

‎pkg/host/internal/bridge/ovs/ovs.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import (
66
"errors"
77
"fmt"
88
"os"
9-
"reflect"
109
"sort"
1110
"strings"
1211
"time"
@@ -15,6 +14,7 @@ import (
1514
"github.com/ovn-org/libovsdb/client"
1615
"github.com/ovn-org/libovsdb/model"
1716
"github.com/ovn-org/libovsdb/ovsdb"
17+
"k8s.io/apimachinery/pkg/api/equality"
1818
"sigs.k8s.io/controller-runtime/pkg/log"
1919

2020
sriovnetworkv1 "github.com/k8snetworkplumbingwg/sriov-network-operator/api/v1"
@@ -83,7 +83,7 @@ func (o *ovs) CreateOVSBridge(ctx context.Context, conf *sriovnetworkv1.OVSConfi
8383
funcLog.Error(err, "CreateOVSBridge(): failed to read data from store")
8484
return fmt.Errorf("failed to read data from store: %v", err)
8585
}
86-
if knownConfig == nil || !reflect.DeepEqual(conf, knownConfig) {
86+
if knownConfig == nil || !equality.Semantic.DeepEqual(conf, knownConfig) {
8787
funcLog.V(2).Info("CreateOVSBridge(): save current configuration to the store")
8888
// config in store manager is not found or it is not the same config as passed with conf arg,
8989
// update config in the store manager
@@ -102,13 +102,13 @@ func (o *ovs) CreateOVSBridge(ctx context.Context, conf *sriovnetworkv1.OVSConfi
102102
return err
103103
}
104104
if currentState != nil {
105-
if reflect.DeepEqual(conf, currentState) {
105+
if equality.Semantic.DeepEqual(conf, currentState) {
106106
// bridge already exist with the right config
107107
funcLog.V(2).Info("CreateOVSBridge(): bridge state already match current configuration, no actions required")
108108
return nil
109109
}
110110
funcLog.V(2).Info("CreateOVSBridge(): bridge state differs from the current configuration, reconfiguration required")
111-
keepBridge = reflect.DeepEqual(conf.Bridge, currentState.Bridge)
111+
keepBridge = equality.Semantic.DeepEqual(conf.Bridge, currentState.Bridge)
112112
}
113113
} else {
114114
funcLog.V(2).Info("CreateOVSBridge(): configuration for the bridge not found in the store, create the bridge")

‎pkg/host/internal/bridge/ovs/ovs_test.go‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -338,6 +338,19 @@ var _ = Describe("OVS", func() {
338338
// dbContent should be exactly same
339339
Expect(dbContent).To(Equal(initialDBContent))
340340
})
341+
It("Bridge already exists, provided config semantically the same", func() {
342+
storedConf := getManagedBridges()["br-0000_d8_00.0"]
343+
providedConf := storedConf.DeepCopy()
344+
storedConf.Uplinks[0].Interface.ExternalIDs = nil
345+
providedConf.Uplinks[0].Interface.ExternalIDs = map[string]string{}
346+
store.EXPECT().GetManagedOVSBridge("br-0000_d8_00.0").Return(storedConf, nil)
347+
initialDBContent := getDefaultInitialDBContent()
348+
createInitialDBContent(ctx, ovsClient, initialDBContent)
349+
Expect(ovs.CreateOVSBridge(ctx, providedConf)).NotTo(HaveOccurred())
350+
dbContent := getDBContent(ctx, ovsClient)
351+
// dbContent should be exactly the same
352+
Expect(dbContent).To(Equal(initialDBContent))
353+
})
341354
It("No Bridge, create bridge", func() {
342355
expectedConf := getManagedBridges()["br-0000_d8_00.0"]
343356
store.EXPECT().GetManagedOVSBridge("br-0000_d8_00.0").Return(nil, nil)

0 commit comments

Comments
 (0)