Merge pull request #2705 from avorima/use-maps

k8s-ci-robot · web-flow · commit cb5107b36b64 · 2024-03-13T11:41:51.000-07:00
🌱 Compare labels and annotations using maps.Equal
diff --git a/pkg/predicate/predicate.go b/pkg/predicate/predicate.go
@@ -17,7 +17,7 @@ limitations under the License.
 package predicate
 
 import (
-	"reflect"
+	"maps"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
@@ -198,7 +198,7 @@ func (AnnotationChangedPredicate) Update(e event.UpdateEvent) bool {
 		return false
 	}
 
-	return !reflect.DeepEqual(e.ObjectNew.GetAnnotations(), e.ObjectOld.GetAnnotations())
+	return !maps.Equal(e.ObjectNew.GetAnnotations(), e.ObjectOld.GetAnnotations())
 }
 
 // LabelChangedPredicate implements a default update predicate function on label change.
@@ -229,7 +229,7 @@ func (LabelChangedPredicate) Update(e event.UpdateEvent) bool {
 		return false
 	}
 
-	return !reflect.DeepEqual(e.ObjectNew.GetLabels(), e.ObjectOld.GetLabels())
+	return !maps.Equal(e.ObjectNew.GetLabels(), e.ObjectOld.GetLabels())
 }
 
 // And returns a composite predicate that implements a logical AND of the predicates passed to it.

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ limitations under the License.`
`17`	`17`	`package predicate`
`18`	`18`
`19`	`19`	`import (`
`20`		`- "reflect"`
	`20`	`+ "maps"`
`21`	`21`
`22`	`22`	`metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"`
`23`	`23`	`"k8s.io/apimachinery/pkg/labels"`
`@@ -198,7 +198,7 @@ func (AnnotationChangedPredicate) Update(e event.UpdateEvent) bool {`
`198`	`198`	`return false`
`199`	`199`	`}`
`200`	`200`
`201`		`- return !reflect.DeepEqual(e.ObjectNew.GetAnnotations(), e.ObjectOld.GetAnnotations())`
	`201`	`+ return !maps.Equal(e.ObjectNew.GetAnnotations(), e.ObjectOld.GetAnnotations())`
`202`	`202`	`}`
`203`	`203`
`204`	`204`	`// LabelChangedPredicate implements a default update predicate function on label change.`
`@@ -229,7 +229,7 @@ func (LabelChangedPredicate) Update(e event.UpdateEvent) bool {`
`229`	`229`	`return false`
`230`	`230`	`}`
`231`	`231`
`232`		`- return !reflect.DeepEqual(e.ObjectNew.GetLabels(), e.ObjectOld.GetLabels())`
	`232`	`+ return !maps.Equal(e.ObjectNew.GetLabels(), e.ObjectOld.GetLabels())`
`233`	`233`	`}`
`234`	`234`
`235`	`235`	`// And returns a composite predicate that implements a logical AND of the predicates passed to it.`