Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refine and fix checkLabelSelectorOverlap #599

Merged
merged 2 commits into from
Jun 11, 2024
Merged

refine and fix checkLabelSelectorOverlap #599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9574b6a
rename checkLabelSelectorOverlap variable
luomingmeng Nov 28, 2023
1d382df
fix checkLabelSelectorOverlap in some conner case
luomingmeng May 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions pkg/controller/kcc/kcct.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -597,14 +597,14 @@ func checkLabelSelectorOverlap(selector labels.Selector, otherSelector labels.Se
keyList []string,
) bool {
for _, key := range keyList {
equalLabelSet, inEqualLabelSet, _ := getMatchLabelSet(selector, key)
otherEqualLabelSet, otherInEqualLabelSet, _ := getMatchLabelSet(otherSelector, key)
if (equalLabelSet.Len() > 0 && otherEqualLabelSet.Len() > 0 && equalLabelSet.Intersection(otherEqualLabelSet).Len() > 0) ||
(equalLabelSet.Len() == 0 && otherEqualLabelSet.Len() == 0 && (inEqualLabelSet.Len() > 0 || otherInEqualLabelSet.Len() > 0)) ||
(inEqualLabelSet.Len() > 0 && !inEqualLabelSet.Intersection(otherEqualLabelSet).Equal(otherEqualLabelSet)) ||
(otherInEqualLabelSet.Len() > 0 && !otherInEqualLabelSet.Intersection(equalLabelSet).Equal(equalLabelSet)) ||
(equalLabelSet.Len() > 0 && otherEqualLabelSet.Len() == 0 && otherInEqualLabelSet.Len() == 0) ||
(otherEqualLabelSet.Len() > 0 && equalLabelSet.Len() == 0 && inEqualLabelSet.Len() == 0) {
equalValueSet, inEqualValueSet, _ := getMatchValueSet(selector, key)
otherEqualValueSet, otherInEqualValueSet, _ := getMatchValueSet(otherSelector, key)
if (equalValueSet.Len() > 0 && otherEqualValueSet.Len() > 0 && equalValueSet.Intersection(otherEqualValueSet).Len() > 0) ||
(equalValueSet.Len() == 0 && otherEqualValueSet.Len() == 0) ||
(inEqualValueSet.Len() > 0 && !inEqualValueSet.Intersection(otherEqualValueSet).Equal(otherEqualValueSet)) ||
(otherInEqualValueSet.Len() > 0 && !otherInEqualValueSet.Intersection(equalValueSet).Equal(equalValueSet)) ||
(equalValueSet.Len() > 0 && otherEqualValueSet.Len() == 0 && otherInEqualValueSet.Len() == 0) ||
(otherEqualValueSet.Len() > 0 && equalValueSet.Len() == 0 && inEqualValueSet.Len() == 0) {
continue
} else {
return false
Expand All @@ -614,26 +614,26 @@ func checkLabelSelectorOverlap(selector labels.Selector, otherSelector labels.Se
return true
}

func getMatchLabelSet(selector labels.Selector, key string) (sets.String, sets.String, error) {
func getMatchValueSet(selector labels.Selector, key string) (sets.String, sets.String, error) {
reqs, selectable := selector.Requirements()
if !selectable {
return nil, nil, fmt.Errorf("labelSelector cannot selectable")
}

equalLabelSet := sets.String{}
inEqualLabelSet := sets.String{}
equalValueSet := sets.String{}
inEqualValueSet := sets.String{}
for _, r := range reqs {
if r.Key() != key {
continue
}
switch r.Operator() {
case selection.Equals, selection.DoubleEquals, selection.In:
equalLabelSet = equalLabelSet.Union(r.Values())
equalValueSet = equalValueSet.Union(r.Values())
case selection.NotEquals, selection.NotIn:
inEqualLabelSet = inEqualLabelSet.Union(r.Values())
inEqualValueSet = inEqualValueSet.Union(r.Values())
default:
return nil, nil, fmt.Errorf("labelSelector operator %s not supported", r.Operator())
}
}
return equalLabelSet, inEqualLabelSet, nil
return equalValueSet, inEqualValueSet, nil
}
9 changes: 9 additions & 0 deletions pkg/controller/kcc/kcct_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -739,6 +739,15 @@ func Test_checkLabelSelectorOverlap(t *testing.T) {
},
want: true,
},
{
name: "test-10",
args: args{
selector: testLabelSelector(t, "label1 notin (aa)"),
otherSelector: testLabelSelector(t, "label1=cc"),
keyList: []string{"label1", "label2"},
},
want: true,
},
}
for _, tt := range tests {
tt := tt
Expand Down
Loading