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.

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

feat(controllers): add support for instanceMatchSelector #1497

Merged
merged 21 commits into from
May 16, 2024
Merged
Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
506fb70
Add - matchExpression
Ronan-WeScale Apr 16, 2024
976c6ea
Add - MatchExpression kind resources
Ronan-WeScale Apr 16, 2024
abc474a
Fix - trailing whitespace
Ronan-WeScale Apr 16, 2024
1884ab4
Remove - unused kind resources
Ronan-WeScale Apr 29, 2024
337b660
Update - controller matchInstance func
Ronan-WeScale Apr 29, 2024
ac4450b
Add - instanceSelector e2e
Ronan-WeScale Apr 29, 2024
d6106d5
Fix - file-checks newline
Ronan-WeScale Apr 29, 2024
e612089
Fix - e2e test by deleting ingress
Ronan-WeScale Apr 30, 2024
3a55005
Add - unit test for labelMatchedExpression func
Ronan-WeScale Apr 30, 2024
20c80ce
Fix - e2e test
Ronan-WeScale Apr 30, 2024
92e4070
chore(controllers): move TestLabelMatchedExpression to another file
weisdd May 5, 2024
57c8cf4
chore: rewrite labelsMatchExpressions and TestLabelsMatchExpressions
weisdd May 5, 2024
5997012
chore: remove e2e for matchExpressions
weisdd May 5, 2024
4fa7dc5
chore: rename labelsMatchExpressions to labelsSatisfyMatchExpressions
weisdd May 5, 2024
3827260
Merge branch 'master' into fix-1401
weisdd May 5, 2024
77c0217
Merge branch 'master' into fix-1401
NissesSenap May 5, 2024
cafe456
fix(labelsMatchExpressions): cover case with different labels
weisdd May 13, 2024
cbabed9
chore(TestLabelsSatisfyMatchExpressions): improve naming for labels
weisdd May 13, 2024
f44b828
Merge branch 'master' into fix-1401
weisdd May 13, 2024
ea373ea
fix(labelsMatchExpressions): reintroduce support for instanceSelector…
weisdd May 16, 2024
c018681
Merge branch 'master' into fix-1401
weisdd May 16, 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
48 changes: 46 additions & 2 deletions controllers/controller_shared.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"bytes"
"context"
"encoding/json"
"slices"
"time"

"github.com/grafana/grafana-operator/v5/api/v1beta1"
Expand Down Expand Up @@ -33,9 +34,52 @@ func GetMatchingInstances(ctx context.Context, k8sClient client.Client, labelSel
opts := []client.ListOption{
client.MatchingLabels(labelSelector.MatchLabels),
}

err := k8sClient.List(ctx, &list, opts...)
return list, err

var selectedList v1beta1.GrafanaList

for _, instance := range list.Items {
selected := labelsSatisfyMatchExpressions(instance.Labels, labelSelector.MatchExpressions)
if selected {
selectedList.Items = append(selectedList.Items, instance)
}
}

return selectedList, err
}

func labelsSatisfyMatchExpressions(labels map[string]string, matchExpressions []metav1.LabelSelectorRequirement) bool {
if len(labels) == 0 {
return false
}
theSuess marked this conversation as resolved.
Show resolved Hide resolved

if len(matchExpressions) == 0 {
return true
}

for _, matchExpression := range matchExpressions {
selected := false

if label, ok := labels[matchExpression.Key]; ok {
switch matchExpression.Operator {
case metav1.LabelSelectorOpDoesNotExist:
selected = false
case metav1.LabelSelectorOpExists:
selected = true
case metav1.LabelSelectorOpIn:
selected = slices.Contains(matchExpression.Values, label)
case metav1.LabelSelectorOpNotIn:
selected = !slices.Contains(matchExpression.Values, label)
}

// All matchExpressions must evaluate to true in order to satisfy the conditions
if !selected {
return false
}
}
}

return true
}

func ReconcilePlugins(ctx context.Context, k8sClient client.Client, scheme *runtime.Scheme, grafana *v1beta1.Grafana, plugins v1beta1.PluginList, resource string) error {
Expand Down
204 changes: 204 additions & 0 deletions controllers/controller_shared_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,204 @@
/*
Copyright 2022.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

package controllers

import (
"testing"

"github.com/stretchr/testify/assert"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

func TestLabelsSatisfyMatchExpressions(t *testing.T) {
tests := []struct {
name string
labels map[string]string
matchExpressions []metav1.LabelSelectorRequirement
want bool
}{
{
name: "No labels and no expressions",
labels: map[string]string{},
matchExpressions: []metav1.LabelSelectorRequirement{},
want: false,
theSuess marked this conversation as resolved.
Show resolved Hide resolved
},
{
name: "No labels",
labels: map[string]string{},
matchExpressions: []metav1.LabelSelectorRequirement{
{
Operator: metav1.LabelSelectorOpExists,
Key: "dashboards",
},
},
want: false,
},
{
name: "No matchExpressions",
labels: map[string]string{
"dashboards": "grafana",
},
matchExpressions: []metav1.LabelSelectorRequirement{},
want: true,
},
{
name: "Matches DoesNotExist",
labels: map[string]string{
"dashboards": "grafana",
},
matchExpressions: []metav1.LabelSelectorRequirement{
{
Operator: metav1.LabelSelectorOpDoesNotExist,
Key: "dashboards",
},
},
want: false,
},
{
name: "Matches Exists",
labels: map[string]string{
"dashboards": "grafana",
},
matchExpressions: []metav1.LabelSelectorRequirement{
{
Operator: metav1.LabelSelectorOpExists,
Key: "dashboards",
},
},
want: true,
},
{
name: "Matches In",
labels: map[string]string{
"dashboards": "grafana",
},
matchExpressions: []metav1.LabelSelectorRequirement{
{
Operator: metav1.LabelSelectorOpIn,
Key: "dashboards",
Values: []string{
"grafana",
},
},
},
want: true,
},
{
name: "Matches NotIn",
labels: map[string]string{
"dashboards": "grafana",
},
matchExpressions: []metav1.LabelSelectorRequirement{
{
Operator: metav1.LabelSelectorOpNotIn,
Key: "dashboards",
Values: []string{
"grafana",
},
},
},
want: false,
},
{
name: "Does not match In",
labels: map[string]string{
"dashboards": "grafana",
},
matchExpressions: []metav1.LabelSelectorRequirement{
{
Operator: metav1.LabelSelectorOpIn,
Key: "dashboards",
Values: []string{
"grafana-external",
},
},
},
want: false,
},
{
name: "Does not match NotIn",
labels: map[string]string{
"dashboards": "grafana",
},
matchExpressions: []metav1.LabelSelectorRequirement{
{
Operator: metav1.LabelSelectorOpNotIn,
Key: "dashboards",
Values: []string{
"grafana-external",
},
},
},
want: true,
},
{
name: "Matches multiple expressions",
labels: map[string]string{
"dashboards": "grafana",
"environment": "production",
},
matchExpressions: []metav1.LabelSelectorRequirement{
{
Operator: metav1.LabelSelectorOpIn,
Key: "dashboards",
Values: []string{
"grafana",
},
},
{
Operator: metav1.LabelSelectorOpIn,
Key: "environment",
Values: []string{
"production",
},
},
},
want: true,
},
{
name: "Doesn't match one of expressions",
labels: map[string]string{
"dashboards": "grafana",
"environment": "production",
},
matchExpressions: []metav1.LabelSelectorRequirement{
{
Operator: metav1.LabelSelectorOpIn,
Key: "dashboards",
Values: []string{
"grafana",
},
},
{
Operator: metav1.LabelSelectorOpIn,
Key: "environment",
Values: []string{
"development",
},
},
},
want: false,
},
}

for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
got := labelsSatisfyMatchExpressions(tt.labels, tt.matchExpressions)
assert.Equal(t, tt.want, got)
})
}
}