fixup! add global lables and annotations to liqo-created resources

Author: aleoli

pkg/liqo-controller-manager/authentication/utils/nonce.go

@@ -55,9 +55,11 @@ func EnsureSignedNonceSecret(ctx context.Context, cl client.Client,
 			return fmt.Errorf("nonce not provided and no nonce secret found")
 		}
 		secret := forge.SignedNonce(remoteClusterID, tenantNamespace, *nonce)
-		if _, err := resource.CreateOrUpdate(ctx, cl, secret, func() error {
-			return nil
-		}); err != nil {
+
+		resource.AddGlobalLabels(secret)
+		resource.AddGlobalAnnotations(secret)
+
+		if err := cl.Create(ctx, secret); err != nil {
 			return fmt.Errorf("unable to create nonce secret: %w", err)
 		}
 		return nil

pkg/liqo-controller-manager/networking/external-network/client-operator/client_controller.go

@@ -220,6 +220,8 @@ func (r *ClientReconciler) EnsureGatewayClient(ctx context.Context, gwClient *ne
 			objChildMetadata["annotations"] = annotations
 		}
 
+		resource.AddGlobalAnnotations(objChild)
+
 		objChild.SetOwnerReferences([]metav1.OwnerReference{
 			{
 				APIVersion: gwClient.APIVersion,

pkg/liqo-controller-manager/networking/external-network/server-operator/server_controller.go

@@ -220,6 +220,8 @@ func (r *ServerReconciler) EnsureGatewayServer(ctx context.Context, gwServer *ne
 			objChildMetadata["annotations"] = annotations
 		}
 
+		resource.AddGlobalAnnotations(objChild)
+
 		objChild.SetOwnerReferences([]metav1.OwnerReference{
 			{
 				APIVersion: gwServer.APIVersion,

pkg/liqo-controller-manager/offloading/shadowendpointslice-controller/shadowendpointslice_controller.go

@@ -145,6 +145,7 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resu
 		utilruntime.Must(ctrl.SetControllerReference(&shadowEps, &newEps, r.Scheme))
 
 		resource.AddGlobalLabels(&newEps)
+		resource.AddGlobalAnnotations(&newEps)
 
 		if err := r.Create(ctx, &newEps, client.FieldOwner(ctrlFieldManager)); err != nil {
 			klog.Errorf("unable to create endpointslice for shadowendpointslice %q: %v", klog.KObj(&shadowEps), err)

pkg/tenantNamespace/bindings.go

@@ -104,6 +104,7 @@ func (nm *tenantNamespaceManager) bindClusterRole(ctx context.Context, cluster l
 	}
 
 	resource.AddGlobalLabels(rb)
+	resource.AddGlobalAnnotations(rb)
 
 	rb, err := nm.client.RbacV1().RoleBindings(namespace.Name).Create(ctx, rb, metav1.CreateOptions{})
 	if apierrors.IsAlreadyExists(err) {
@@ -174,6 +175,7 @@ func (nm *tenantNamespaceManager) bindClusterRoleClusterWide(ctx context.Context
 	}
 
 	resource.AddGlobalLabels(crb)
+	resource.AddGlobalAnnotations(crb)
 
 	crb, err := nm.client.RbacV1().ClusterRoleBindings().Create(ctx, crb, metav1.CreateOptions{})
 	if apierrors.IsAlreadyExists(err) {

pkg/utils/resource/annotations.go

@@ -15,6 +15,8 @@
 package resource
 
 import (
+	"maps"
+
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
@@ -34,26 +36,7 @@ func SetGlobalAnnotations(annotations map[string]string) {
 
 // GetGlobalAnnotations returns a copy of the current global annotations.
 func GetGlobalAnnotations() map[string]string {
-	if globalAnnotations == nil {
-		return make(map[string]string)
-	}
-	result := make(map[string]string, len(globalAnnotations))
-	for k, v := range globalAnnotations {
-		result[k] = v
-	}
-	return result
-}
-
-// MergeAnnotations creates a new map containing all global annotations.
-// Optionally, additional annotations can be provided which will be merged with the global annotations.
-func MergeAnnotations(additionalAnnotations ...map[string]string) map[string]string {
-	result := GetGlobalAnnotations()
-	for _, annotations := range additionalAnnotations {
-		for k, v := range annotations {
-			result[k] = v
-		}
-	}
-	return result
+	return maps.Clone(globalAnnotations)
 }
 
 // AddGlobalAnnotations adds the global annotations to the given object's annotations.
@@ -62,9 +45,5 @@ func AddGlobalAnnotations(obj metav1.Object) {
 	if obj.GetAnnotations() == nil {
 		obj.SetAnnotations(make(map[string]string))
 	}
-	annotations := obj.GetAnnotations()
-	for k, v := range globalAnnotations {
-		annotations[k] = v
-	}
-	obj.SetAnnotations(annotations)
+	maps.Copy(obj.GetAnnotations(), globalAnnotations)
 }

pkg/utils/resource/labels.go

@@ -15,11 +15,9 @@
 package resource
 
 import (
-	"context"
+	"maps"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"sigs.k8s.io/controller-runtime/pkg/client"
-	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 )
 
 var (
@@ -38,14 +36,7 @@ func SetGlobalLabels(labels map[string]string) {
 
 // GetGlobalLabels returns a copy of the current global labels.
 func GetGlobalLabels() map[string]string {
-	if globalLabels == nil {
-		return make(map[string]string)
-	}
-	result := make(map[string]string, len(globalLabels))
-	for k, v := range globalLabels {
-		result[k] = v
-	}
-	return result
+	return maps.Clone(globalLabels)
 }
 
 // AddGlobalLabels adds the global labels to the given object's labels.
@@ -54,58 +45,5 @@ func AddGlobalLabels(obj metav1.Object) {
 	if obj.GetLabels() == nil {
 		obj.SetLabels(make(map[string]string))
 	}
-	labels := obj.GetLabels()
-	for k, v := range globalLabels {
-		labels[k] = v
-	}
-	obj.SetLabels(labels)
-}
-
-// MergeLabels creates a new map containing all global labels.
-// Optionally, additional labels can be provided which will be merged with the global labels.
-func MergeLabels(additionalLabels ...map[string]string) map[string]string {
-	result := GetGlobalLabels()
-	for _, labels := range additionalLabels {
-		for k, v := range labels {
-			result[k] = v
-		}
-	}
-	return result
-}
-
-// CreateOrUpdate is a wrapper around controllerutil.CreateOrUpdate that automatically adds global labels and annotations.
-// It takes the same parameters as controllerutil.CreateOrUpdate plus an optional list of additional labels to merge.
-func CreateOrUpdate(ctx context.Context, c client.Client, obj client.Object,
-	mutateFn func() error) (controllerutil.OperationResult, error) {
-	// Create a wrapper mutation function that adds labels before calling the original
-	wrappedMutateFn := func() error {
-		// First call the original mutation function
-		if err := mutateFn(); err != nil {
-			return err
-		}
-
-		// Then add global labels and any additional labels
-		if obj.GetLabels() == nil {
-			obj.SetLabels(make(map[string]string))
-		}
-		labels := obj.GetLabels()
-		for k, v := range GetGlobalLabels() {
-			labels[k] = v
-		}
-		obj.SetLabels(labels)
-
-		// Add global annotations
-		if obj.GetAnnotations() == nil {
-			obj.SetAnnotations(make(map[string]string))
-		}
-		annotations := obj.GetAnnotations()
-		for k, v := range GetGlobalAnnotations() {
-			annotations[k] = v
-		}
-		obj.SetAnnotations(annotations)
-
-		return nil
-	}
-
-	return controllerutil.CreateOrUpdate(ctx, c, obj, wrappedMutateFn)
+	maps.Copy(obj.GetLabels(), globalLabels)
 }

pkg/utils/resource/wrappers.go

@@ -0,0 +1,59 @@
+// Copyright 2019-2024 The Liqo Authors
+//
+// 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 resource
+
+import (
+	"context"
+
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
+)
+
+// CreateOrUpdate is a wrapper around controllerutil.CreateOrUpdate that automatically adds global labels and annotations.
+// It takes the same parameters as controllerutil.CreateOrUpdate plus an optional list of additional labels to merge.
+func CreateOrUpdate(ctx context.Context, c client.Client, obj client.Object,
+	mutateFn func() error) (controllerutil.OperationResult, error) {
+	// Create a wrapper mutation function that adds labels before calling the original
+	wrappedMutateFn := func() error {
+		// First call the original mutation function
+		if err := mutateFn(); err != nil {
+			return err
+		}
+
+		// Then add global labels and any additional labels
+		if obj.GetLabels() == nil {
+			obj.SetLabels(make(map[string]string))
+		}
+		labels := obj.GetLabels()
+		for k, v := range GetGlobalLabels() {
+			labels[k] = v
+		}
+		obj.SetLabels(labels)
+
+		// Add global annotations
+		if obj.GetAnnotations() == nil {
+			obj.SetAnnotations(make(map[string]string))
+		}
+		annotations := obj.GetAnnotations()
+		for k, v := range GetGlobalAnnotations() {
+			annotations[k] = v
+		}
+		obj.SetAnnotations(annotations)
+
+		return nil
+	}
+
+	return controllerutil.CreateOrUpdate(ctx, c, obj, wrappedMutateFn)
+}