remove LabelSelectorString

minio · Jun 6, 2024 · 571aa1a · 571aa1a
1 parent 3365f8e
commit 571aa1a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 27 deletions.
diff --git a/pkg/controller/main-controller.go b/pkg/controller/main-controller.go
@@ -37,6 +37,7 @@ import (
 	"github.com/minio/minio-go/v7/pkg/set"
 	"github.com/minio/operator/pkg/controller/certificates"
 	"k8s.io/apimachinery/pkg/api/meta"
+	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/klog/v2"
 
 	"k8s.io/client-go/tools/leaderelection"
@@ -251,17 +252,10 @@ func NewController(
 	recorder := eventBroadcaster.NewRecorder(scheme.Scheme, corev1.EventSource{Component: controllerAgentName})
 
 	// Create PodInformer for Tenant Pods
-	labelSelector := metav1.LabelSelector{
-		MatchExpressions: []metav1.LabelSelectorRequirement{
-			{
-				Key:      miniov2.TenantLabel,
-				Operator: metav1.LabelSelectorOpExists,
-			},
-		},
-	}
-	labelSelectorString, err := utils.LabelSelectorToString(labelSelector)
-	if err != nil {
+	labelSelectorString := miniov2.TenantLabel // "<key>" -> "Key exists"
+	if _, err := labels.Parse(labelSelectorString); err != nil {
 		klog.Errorf("bad label: %s for podInformer", labelSelectorString)
+		labelSelectorString = "" // falback value
 	}
 
 	podInformer := utils.NewPodInformer(kubeClientSet, labelSelectorString)

diff --git a/pkg/utils/utils.go b/pkg/utils/utils.go
@@ -29,7 +29,6 @@ import (
 	"github.com/google/uuid"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/watch"
 	"k8s.io/client-go/kubernetes"
@@ -106,22 +105,6 @@ func NewPodInformer(kubeClientSet kubernetes.Interface, labelSelectorString stri
 	)
 }
 
-// LabelSelectorToString gets a string from a labelSelector
-func LabelSelectorToString(labelSelector metav1.LabelSelector) (string, error) {
-	var matchExpressions []string
-	for _, expr := range labelSelector.MatchExpressions {
-		// Handle only Exists expressions
-		matchExpressions = append(matchExpressions, expr.Key)
-	}
-	// Join match labels and match expressions into a single string with a comma separator.
-	labelSelectorString := strings.Join(matchExpressions, ",")
-	// Validate labelSelectorString
-	if _, err := labels.Parse(labelSelectorString); err != nil {
-		return "", err
-	}
-	return labelSelectorString, nil
-}
-
 // CastObjectToMetaV1 gets a metav1.Object from an interface
 func CastObjectToMetaV1(obj interface{}) (metav1.Object, error) {
 	var object metav1.Object