fix: Replace cmp package with reflect package in production code (#584)

Azure · Oct 31, 2023 · 712cb45 · 712cb45
1 parent a05e8f6
commit 712cb45
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/pkg/controllers/membercluster/v1alpha1/membercluster_controller.go b/pkg/controllers/membercluster/v1alpha1/membercluster_controller.go
@@ -8,9 +8,9 @@ package v1alpha1
 import (
 	"context"
 	"fmt"
+	"reflect"
 	"time"
 
-	"github.com/google/go-cmp/cmp"
 	corev1 "k8s.io/api/core/v1"
 	rbacv1 "k8s.io/api/rbac/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
@@ -299,7 +299,7 @@ func (r *Reconciler) syncRole(ctx context.Context, mc *fleetv1alpha1.MemberClust
 	}
 
 	// Updates role if currentRole != expectedRole.
-	if cmp.Equal(currentRole.Rules, expectedRole.Rules) {
+	if reflect.DeepEqual(currentRole.Rules, expectedRole.Rules) {
 		return roleName, nil
 	}
 	currentRole.Rules = expectedRole.Rules
@@ -347,7 +347,7 @@ func (r *Reconciler) syncRoleBinding(ctx context.Context, mc *fleetv1alpha1.Memb
 	}
 
 	// Updates role binding if currentRoleBinding != expectedRoleBinding.
-	if cmp.Equal(currentRoleBinding.Subjects, expectedRoleBinding.Subjects) && cmp.Equal(currentRoleBinding.RoleRef, expectedRoleBinding.RoleRef) {
+	if reflect.DeepEqual(currentRoleBinding.Subjects, expectedRoleBinding.Subjects) && reflect.DeepEqual(currentRoleBinding.RoleRef, expectedRoleBinding.RoleRef) {
 		return nil
 	}
 	currentRoleBinding.Subjects = expectedRoleBinding.Subjects
@@ -389,7 +389,7 @@ func (r *Reconciler) syncInternalMemberCluster(ctx context.Context, mc *fleetv1a
 	}
 
 	// Updates internal member cluster if currentImc != expectedImc.
-	if cmp.Equal(currentImc.Spec, expectedImc.Spec) {
+	if reflect.DeepEqual(currentImc.Spec, expectedImc.Spec) {
 		return currentImc, nil
 	}
 	currentImc.Spec = expectedImc.Spec

diff --git a/pkg/controllers/membercluster/v1beta1/membercluster_controller.go b/pkg/controllers/membercluster/v1beta1/membercluster_controller.go
@@ -8,9 +8,9 @@ package v1beta1
 import (
 	"context"
 	"fmt"
+	"reflect"
 	"time"
 
-	"github.com/google/go-cmp/cmp"
 	corev1 "k8s.io/api/core/v1"
 	rbacv1 "k8s.io/api/rbac/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
@@ -318,7 +318,7 @@ func (r *Reconciler) syncRole(ctx context.Context, mc *clusterv1beta1.MemberClus
 	}
 
 	// Updates role if currentRole != expectedRole.
-	if cmp.Equal(currentRole.Rules, expectedRole.Rules) {
+	if reflect.DeepEqual(currentRole.Rules, expectedRole.Rules) {
 		return roleName, nil
 	}
 	currentRole.Rules = expectedRole.Rules
@@ -366,7 +366,7 @@ func (r *Reconciler) syncRoleBinding(ctx context.Context, mc *clusterv1beta1.Mem
 	}
 
 	// Updates role binding if currentRoleBinding != expectedRoleBinding.
-	if cmp.Equal(currentRoleBinding.Subjects, expectedRoleBinding.Subjects) && cmp.Equal(currentRoleBinding.RoleRef, expectedRoleBinding.RoleRef) {
+	if reflect.DeepEqual(currentRoleBinding.Subjects, expectedRoleBinding.Subjects) && reflect.DeepEqual(currentRoleBinding.RoleRef, expectedRoleBinding.RoleRef) {
 		return nil
 	}
 	currentRoleBinding.Subjects = expectedRoleBinding.Subjects
@@ -412,7 +412,7 @@ func (r *Reconciler) syncInternalMemberCluster(ctx context.Context, mc *clusterv
 	}
 
 	// Updates internal member cluster if currentImc != expectedImc.
-	if cmp.Equal(currentImc.Spec, expectedImc.Spec) {
+	if reflect.DeepEqual(currentImc.Spec, expectedImc.Spec) {
 		return currentImc, nil
 	}
 	currentImc.Spec = expectedImc.Spec