From c0f478a488ce1bb37c87bb9771473552ac28e46c Mon Sep 17 00:00:00 2001 From: Justin SB Date: Tue, 7 Sep 2021 13:25:08 -0400 Subject: [PATCH] Use utils string-slice comparison go-cmp/cmp is intended for tests, and is much less efficient here. --- staging/publishing/import-restrictions.yaml | 1 + staging/src/k8s.io/apimachinery/pkg/labels/selector.go | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/staging/publishing/import-restrictions.yaml b/staging/publishing/import-restrictions.yaml index 4c77396c28a..87a830404e6 100644 --- a/staging/publishing/import-restrictions.yaml +++ b/staging/publishing/import-restrictions.yaml @@ -36,6 +36,7 @@ - k8s.io/apimachinery - k8s.io/kube-openapi - k8s.io/utils/net + - k8s.io/utils/strings - k8s.io/klog - baseImportPath: "./vendor/k8s.io/api/" diff --git a/staging/src/k8s.io/apimachinery/pkg/labels/selector.go b/staging/src/k8s.io/apimachinery/pkg/labels/selector.go index 9eea34579b8..2434429b9f8 100644 --- a/staging/src/k8s.io/apimachinery/pkg/labels/selector.go +++ b/staging/src/k8s.io/apimachinery/pkg/labels/selector.go @@ -22,12 +22,12 @@ import ( "strconv" "strings" - "github.com/google/go-cmp/cmp" "k8s.io/apimachinery/pkg/selection" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/validation" "k8s.io/apimachinery/pkg/util/validation/field" "k8s.io/klog/v2" + stringslices "k8s.io/utils/strings/slices" ) var ( @@ -288,7 +288,7 @@ func (r Requirement) Equal(x Requirement) bool { if r.operator != x.operator { return false } - return cmp.Equal(r.strValues, x.strValues) + return stringslices.Equal(r.strValues, x.strValues) } // Empty returns true if the internalSelector doesn't restrict selection space