github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #121496 from benluddy/metav1-labelselector-fuzz

Browse Source 
Deduplicate set expression values in metav1.LabelSelector fuzzer.
This commit is contained in:
Kubernetes Prow Robot
2024-05-03 11:08:25 -07:00
committed by GitHub
parent f97ac220fd a4c2f78b28
commit 99129ed5eb
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
staging/src/k8s.io/apimachinery/pkg/apis/meta/fuzzer/fuzzer.go
View File

@@ -33,6 +33,7 @@ import (
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
runtimeserializer "k8s.io/apimachinery/pkg/runtime/serializer" runtimeserializer "k8s.io/apimachinery/pkg/runtime/serializer"
"k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/sets"
) )
func genericFuzzerFuncs(codecs runtimeserializer.CodecFactory) []interface{} { func genericFuzzerFuncs(codecs runtimeserializer.CodecFactory) []interface{} {
@@ -249,8 +250,9 @@ func v1FuzzerFuncs(codecs runtimeserializer.CodecFactory) []interface{} {
} }
if j.MatchExpressions != nil { if j.MatchExpressions != nil {
// NB: the label selector parser code sorts match expressions by key, and sorts the values, // NB: the label selector parser code sorts match expressions by key, and
// so we need to make sure ours are sorted as well here to preserve round-trip comparison. // sorts and deduplicates the values, so we need to make sure ours are
// sorted and deduplicated as well here to preserve round-trip comparison.
// In practice, not sorting doesn't hurt anything... // In practice, not sorting doesn't hurt anything...
for i := range j.MatchExpressions { for i := range j.MatchExpressions {
@@ -266,7 +268,7 @@ func v1FuzzerFuncs(codecs runtimeserializer.CodecFactory) []interface{} {
for i := range req.Values { for i := range req.Values {
req.Values[i] = randomLabelPart(c, true) req.Values[i] = randomLabelPart(c, true)
} }
sort.Strings(req.Values) req.Values = sets.List(sets.New(req.Values...))
} else { } else {
req.Values = nil req.Values = nil
} }