Replaced hasAnyLabel with labels.Set...Has

fwiesel · fwiesel · commit a08a1e341f63 · 2025-07-09T10:59:29.000+02:00
diff --git a/internal/controller/aggregates_controller.go b/internal/controller/aggregates_controller.go
@@ -24,6 +24,7 @@ import (
 	"strings"
 
 	corev1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/runtime"
 	ctrl "sigs.k8s.io/controller-runtime"
 	k8sclient "sigs.k8s.io/controller-runtime/pkg/client"
@@ -56,7 +57,7 @@ func (r *AggregatesController) Reconcile(ctx context.Context, req ctrl.Request)
 		return ctrl.Result{}, k8sclient.IgnoreNotFound(err)
 	}
 
-	if !hasAnyLabel(node.Labels, labelServiceID) {
+	if !(labels.Set)(node.Labels).Has(labelServiceID) {
 		return ctrl.Result{}, nil
 	}
 
diff --git a/internal/controller/decomission_controller.go b/internal/controller/decomission_controller.go
@@ -23,6 +23,7 @@ import (
 	"net/http"
 
 	corev1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/runtime"
 	ctrl "sigs.k8s.io/controller-runtime"
 	k8sclient "sigs.k8s.io/controller-runtime/pkg/client"
@@ -63,7 +64,7 @@ func (r *NodeDecommissionReconciler) Reconcile(ctx context.Context, req ctrl.Req
 		return ctrl.Result{}, k8sclient.IgnoreNotFound(err)
 	}
 
-	found := hasAnyLabel(node.Labels, labelLifecycleMode)
+	found := (labels.Set)(node.Labels).Has(labelLifecycleMode)
 
 	if !found {
 		// Get out of the way
diff --git a/internal/controller/maintenance_controller.go b/internal/controller/maintenance_controller.go
@@ -26,6 +26,7 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	policyv1 "k8s.io/api/policy/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/util/intstr"
 	"k8s.io/client-go/util/retry"
@@ -71,7 +72,7 @@ func (r *MaintenanceController) Reconcile(ctx context.Context, req ctrl.Request)
 		return ctrl.Result{}, k8sclient.IgnoreNotFound(err)
 	}
 
-	if !hasAnyLabel(node.Labels, labelLifecycleMode) {
+	if !(labels.Set)(node.Labels).Has(labelLifecycleMode) {
 		return ctrl.Result{}, nil
 	}
 
diff --git a/internal/controller/node_certificate_controller.go b/internal/controller/node_certificate_controller.go
@@ -27,6 +27,7 @@ import (
 	cmmeta "github.com/cert-manager/cert-manager/pkg/apis/meta/v1"
 	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/client-go/util/retry"
 	ctrl "sigs.k8s.io/controller-runtime"
@@ -162,7 +163,7 @@ func (r *NodeCertificateController) Reconcile(ctx context.Context, req ctrl.Requ
 		return ctrl.Result{}, k8sclient.IgnoreNotFound(err)
 	}
 
-	found := hasAnyLabel(node.Labels, labelHypervisor)
+	found := (labels.Set)(node.Labels).Has(labelHypervisor)
 
 	if !found {
 		return ctrl.Result{}, nil
diff --git a/internal/controller/onboarding_controller.go b/internal/controller/onboarding_controller.go
@@ -25,6 +25,7 @@ import (
 	"time"
 
 	corev1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"
 	ctrl "sigs.k8s.io/controller-runtime"
@@ -95,7 +96,7 @@ func (r *OnboardingController) Reconcile(ctx context.Context, req ctrl.Request)
 		return ctrl.Result{}, k8sclient.IgnoreNotFound(err)
 	}
 
-	found := hasAnyLabel(node.Labels, labelHypervisor)
+	found := (labels.Set)(node.Labels).Has(labelHypervisor)
 
 	if !found {
 		return ctrl.Result{}, nil
diff --git a/internal/controller/traits_controller.go b/internal/controller/traits_controller.go
@@ -24,6 +24,7 @@ import (
 	"strings"
 
 	corev1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/runtime"
 	ctrl "sigs.k8s.io/controller-runtime"
 	k8sclient "sigs.k8s.io/controller-runtime/pkg/client"
@@ -58,7 +59,7 @@ func (r *TraitsController) Reconcile(ctx context.Context, req ctrl.Request) (ctr
 		return ctrl.Result{}, k8sclient.IgnoreNotFound(err)
 	}
 
-	if !hasAnyLabel(node.Labels, labelHypervisor) {
+	if !(labels.Set)(node.Labels).Has(labelHypervisor) {
 		return ctrl.Result{}, nil
 	}
 
diff --git a/internal/controller/utils.go b/internal/controller/utils.go
@@ -36,16 +36,6 @@ func setNodeLabels(ctx context.Context, writer client.Writer, node *corev1.Node,
 	return true, writer.Patch(ctx, newNode, client.MergeFrom(node))
 }
 
-func hasAnyLabel(labels map[string]string, list ...string) bool {
-	for _, label := range list {
-		if _, found := labels[label]; found {
-			return true
-		}
-	}
-
-	return false
-}
-
 // setNodeAnnotations sets annotations on the node.
 func setNodeAnnotations(ctx context.Context, writer client.Writer, node *corev1.Node, annotations map[string]string) error {
 	newNode := node.DeepCopy()

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ import (`
`24`	`24`	`"strings"`
`25`	`25`
`26`	`26`	`corev1 "k8s.io/api/core/v1"`
	`27`	`+ "k8s.io/apimachinery/pkg/labels"`
`27`	`28`	`"k8s.io/apimachinery/pkg/runtime"`
`28`	`29`	`ctrl "sigs.k8s.io/controller-runtime"`
`29`	`30`	`k8sclient "sigs.k8s.io/controller-runtime/pkg/client"`
`@@ -56,7 +57,7 @@ func (r *AggregatesController) Reconcile(ctx context.Context, req ctrl.Request)`
`56`	`57`	`return ctrl.Result{}, k8sclient.IgnoreNotFound(err)`
`57`	`58`	`}`
`58`	`59`
`59`		`- if !hasAnyLabel(node.Labels, labelServiceID) {`
	`60`	`+ if !(labels.Set)(node.Labels).Has(labelServiceID) {`
`60`	`61`	`return ctrl.Result{}, nil`
`61`	`62`	`}`
`62`	`63`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@ import (`
`26`	`26`	`corev1 "k8s.io/api/core/v1"`
`27`	`27`	`policyv1 "k8s.io/api/policy/v1"`
`28`	`28`	`metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"`
	`29`	`+ "k8s.io/apimachinery/pkg/labels"`
`29`	`30`	`"k8s.io/apimachinery/pkg/runtime"`
`30`	`31`	`"k8s.io/apimachinery/pkg/util/intstr"`
`31`	`32`	`"k8s.io/client-go/util/retry"`
`@@ -71,7 +72,7 @@ func (r *MaintenanceController) Reconcile(ctx context.Context, req ctrl.Request)`
`71`	`72`	`return ctrl.Result{}, k8sclient.IgnoreNotFound(err)`
`72`	`73`	`}`
`73`	`74`
`74`		`- if !hasAnyLabel(node.Labels, labelLifecycleMode) {`
	`75`	`+ if !(labels.Set)(node.Labels).Has(labelLifecycleMode) {`
`75`	`76`	`return ctrl.Result{}, nil`
`76`	`77`	`}`
`77`	`78`