github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-26 05:03:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #104819 from justinsb/less_cmp

Browse Source 
Use utils string-slice comparison
This commit is contained in:
Kubernetes Prow Robot 2022-01-05 10:34:00 -08:00 committed by GitHub
commit a0d638bd79
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
staging/publishing/import-restrictions.yaml
View File

@ -37,6 +37,7 @@
- k8s.io/kube-openapi - k8s.io/kube-openapi
- k8s.io/utils/clock - k8s.io/utils/clock
- k8s.io/utils/net - k8s.io/utils/net
- k8s.io/utils/strings
- k8s.io/klog - k8s.io/klog
- baseImportPath: "./vendor/k8s.io/api/" - baseImportPath: "./vendor/k8s.io/api/"

4
staging/src/k8s.io/apimachinery/pkg/labels/selector.go
View File

@ -22,12 +22,12 @@ import (
"strconv" "strconv"
"strings" "strings"
"github.com/google/go-cmp/cmp"
"k8s.io/apimachinery/pkg/selection" "k8s.io/apimachinery/pkg/selection"
"k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/sets"
"k8s.io/apimachinery/pkg/util/validation" "k8s.io/apimachinery/pkg/util/validation"
"k8s.io/apimachinery/pkg/util/validation/field" "k8s.io/apimachinery/pkg/util/validation/field"
"k8s.io/klog/v2" "k8s.io/klog/v2"
stringslices "k8s.io/utils/strings/slices"
) )
var ( var (
@ -288,7 +288,7 @@ func (r Requirement) Equal(x Requirement) bool {
if r.operator != x.operator { if r.operator != x.operator {
return false 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 // Empty returns true if the internalSelector doesn't restrict selection space