Skip to content

perf: [NPM] Use Equal function for label comparison instead of using reflect.DeepEqual in namespaceController #1107

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 17, 2021
Merged

perf: [NPM] Use Equal function for label comparison instead of using reflect.DeepEqual in namespaceController #1107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions npm/pkg/controlplane/controllers/v1/nameSpaceController.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ package controllers
import (
"encoding/json"
"fmt"
"reflect"
"sync"
"time"

Expand All @@ -15,6 +14,7 @@ import (
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
k8slabels "k8s.io/apimachinery/pkg/labels"
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
"k8s.io/apimachinery/pkg/util/wait"
coreinformer "k8s.io/client-go/informers/core/v1"
Expand Down Expand Up @@ -288,7 +288,7 @@ func (nsc *NamespaceController) syncNameSpace(key string) error {

cachedNsObj, nsExists := nsc.npmNamespaceCache.NsMap[cachedNsKey]
if nsExists {
if reflect.DeepEqual(cachedNsObj.LabelsMap, nsObj.ObjectMeta.Labels) {
if k8slabels.Equals(cachedNsObj.LabelsMap, nsObj.ObjectMeta.Labels) {
klog.Infof("[NAMESPACE UPDATE EVENT] Namespace [%s] labels did not change", key)
return nil
}
Expand Down
4 changes: 2 additions & 2 deletions npm/pkg/controlplane/controllers/v2/namespacecontroller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import (
"encoding/json"
"errors"
"fmt"
"reflect"
"sync"
"time"

Expand All @@ -16,6 +15,7 @@ import (
"github.com/Azure/azure-container-networking/npm/util"
corev1 "k8s.io/api/core/v1"
k8serrors "k8s.io/apimachinery/pkg/api/errors"
k8slabels "k8s.io/apimachinery/pkg/labels"
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
"k8s.io/apimachinery/pkg/util/wait"
coreinformer "k8s.io/client-go/informers/core/v1"
Expand Down Expand Up @@ -285,7 +285,7 @@ func (nsc *NamespaceController) syncNamespace(nsKey string) error {

cachedNsObj, nsExists := nsc.npmNamespaceCache.NsMap[nsKey]
if nsExists {
if reflect.DeepEqual(cachedNsObj.LabelsMap, nsObj.ObjectMeta.Labels) {
if k8slabels.Equals(cachedNsObj.LabelsMap, nsObj.ObjectMeta.Labels) {
klog.Infof("[NAMESPACE UPDATE EVENT] Namespace [%s] labels did not change", nsKey)
return nil
}
Expand Down