From f21dd69478a826d62b7cc1ec100bdfc56b39a2af Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Tue, 10 Jun 2025 23:08:41 -0400 Subject: [PATCH] Add a replacement for cmp.Diff using json+go-difflib Co-authored-by: Jordan Liggitt Signed-off-by: Davanum Srinivas Kubernetes-commit: 03afe6471bdbf6462b7035fdaae5aa0dd9545396 --- util/consistencydetector/data_consistency_detector.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/util/consistencydetector/data_consistency_detector.go b/util/consistencydetector/data_consistency_detector.go index 72a871d43..32ee2c760 100644 --- a/util/consistencydetector/data_consistency_detector.go +++ b/util/consistencydetector/data_consistency_detector.go @@ -19,14 +19,14 @@ package consistencydetector import ( "context" "fmt" + "reflect" "sort" "time" - "github.com/google/go-cmp/cmp" //nolint:depguard - "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apimachinery/pkg/util/diff" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/klog/v2" ) @@ -75,8 +75,8 @@ func CheckDataConsistency[T runtime.Object, U any](ctx context.Context, identity sort.Sort(byUID(listItems)) sort.Sort(byUID(retrievedItems)) - if !cmp.Equal(listItems, retrievedItems) { - klog.Infof("previously received data for %s is different than received by the standard list api call against etcd, diff: %v", identity, cmp.Diff(listItems, retrievedItems)) + if !reflect.DeepEqual(listItems, retrievedItems) { + klog.Infof("previously received data for %s is different than received by the standard list api call against etcd, diff: %v", identity, diff.Diff(listItems, retrievedItems)) msg := fmt.Sprintf("data inconsistency detected for %s, panicking!", identity) panic(msg) }