Update PR

Author: lukasfrank

broker/machinebroker/server/reservation_create.go

@@ -11,6 +11,7 @@ import (
 	computev1alpha1 "github.com/ironcore-dev/ironcore/api/compute/v1alpha1"
 	"github.com/ironcore-dev/ironcore/api/core/v1alpha1"
 	"github.com/ironcore-dev/ironcore/broker/common/cleaner"
+	brokerutils "github.com/ironcore-dev/ironcore/broker/common/utils"
 	machinebrokerv1alpha1 "github.com/ironcore-dev/ironcore/broker/machinebroker/api/v1alpha1"
 	"github.com/ironcore-dev/ironcore/broker/machinebroker/apiutils"
 	iri "github.com/ironcore-dev/ironcore/iri/apis/machine/v1alpha1"
@@ -21,22 +22,6 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
-func prepareIronCoreLabels[T metav1alpha1.Object](obj T, brokerDownwardAPILabels map[string]string) (map[string]string, error) {
-	labels := make(map[string]string)
-
-	for downwardAPILabelName, defaultLabelName := range brokerDownwardAPILabels {
-		value := obj.GetMetadata().GetLabels()[machinepoolletv1alpha1.DownwardAPILabel(downwardAPILabelName)]
-		if value == "" {
-			value = obj.GetMetadata().GetLabels()[defaultLabelName]
-		}
-		if value != "" {
-			labels[machinepoolletv1alpha1.DownwardAPILabel(downwardAPILabelName)] = value
-		}
-	}
-
-	return labels, nil
-}
-
 func prepareIronCoreAnnotations[T metav1alpha1.Object](obj T) (map[string]string, error) {
 	annotationsValue, err := apiutils.EncodeAnnotationsAnnotation(obj.GetMetadata().GetAnnotations())
 	if err != nil {
@@ -60,10 +45,11 @@ func (s *Server) createIronCoreReservation(
 	iriReservation *iri.Reservation,
 ) (res *computev1alpha1.Reservation, retErr error) {
 
-	labels, err := prepareIronCoreLabels(iriReservation, s.brokerDownwardAPILabels)
-	if err != nil {
-		return nil, fmt.Errorf("error preparing ironcore reservation labels: %w", err)
-	}
+	labels := brokerutils.PrepareDownwardAPILabels(
+		iriReservation.GetMetadata().GetLabels(),
+		s.brokerDownwardAPILabels,
+		machinepoolletv1alpha1.MachineDownwardAPIPrefix,
+	)
 
 	annotations, err := prepareIronCoreAnnotations(iriReservation)
 	if err != nil {

broker/machinebroker/server/reservation_create_test.go

@@ -4,6 +4,8 @@
 package server_test
 
 import (
+	"fmt"
+
 	computev1alpha1 "github.com/ironcore-dev/ironcore/api/compute/v1alpha1"
 	corev1alpha1 "github.com/ironcore-dev/ironcore/api/core/v1alpha1"
 	machinebrokerv1alpha1 "github.com/ironcore-dev/ironcore/broker/machinebroker/api/v1alpha1"
@@ -50,9 +52,9 @@ var _ = Describe("CreateReservation", func() {
 
 		By("inspecting the ironcore reservation")
 		Expect(ironcoreReservation.Labels).To(Equal(map[string]string{
-			machinepoolletv1alpha1.DownwardAPILabel("root-reservation-uid"): "foobar",
-			machinebrokerv1alpha1.CreatedLabel:                              "true",
-			machinebrokerv1alpha1.ManagerLabel:                              machinebrokerv1alpha1.ReservationBrokerManager,
+			fmt.Sprint(machinepoolletv1alpha1.MachineDownwardAPIPrefix, "root-reservation-uid"): "foobar",
+			machinebrokerv1alpha1.CreatedLabel:                                                  "true",
+			machinebrokerv1alpha1.ManagerLabel:                                                  machinebrokerv1alpha1.ReservationBrokerManager,
 		}))
 		encodedIRIAnnotations, err := apiutils.EncodeAnnotationsAnnotation(nil)
 		Expect(err).NotTo(HaveOccurred())

broker/machinebroker/server/server_suite_test.go

@@ -136,9 +136,9 @@ func SetupTest() (*corev1.Namespace, *server.Server) {
 		newSrv, err := server.New(cfg, ns.Name, server.Options{
 			BaseURL: baseURL,
 			BrokerDownwardAPILabels: map[string]string{
-				"root-machine-uid": machinepoolletv1alpha1.MachineUIDLabel,
-				"root-nic-uid":     machinepoolletv1alpha1.NetworkInterfaceUIDLabel,
-				"root-network-uid": machinepoolletv1alpha1.NetworkUIDLabel,
+				"root-machine-uid":     machinepoolletv1alpha1.MachineUIDLabel,
+				"root-nic-uid":         machinepoolletv1alpha1.NetworkInterfaceUIDLabel,
+				"root-network-uid":     machinepoolletv1alpha1.NetworkUIDLabel,
 				"root-reservation-uid": machinepoolletv1alpha1.ReservationUIDLabel,
 			},
 		})

client-go/informers/externalversions/compute/v1alpha1/reservation.go

@@ -72,6 +72,8 @@ func PrepareDownwardAPILabels(
 		switch o := obj.(type) {
 		case *computev1alpha1.Machine:
 			value, err = fieldpath.ExtractFieldPathAsString(o, fieldPath)
+		case *computev1alpha1.Reservation:
+			value, err = fieldpath.ExtractFieldPathAsString(o, fieldPath)
 		case *networkingv1alpha1.Network:
 			value, err = fieldpath.ExtractFieldPathAsString(o, fieldPath)
 		case *networkingv1alpha1.NetworkInterface:

poollet/common/utils/utils.go

@@ -14,8 +14,10 @@ import (
 	irimachine "github.com/ironcore-dev/ironcore/iri/apis/machine"
 	iri "github.com/ironcore-dev/ironcore/iri/apis/machine/v1alpha1"
 	irimeta "github.com/ironcore-dev/ironcore/iri/apis/meta/v1alpha1"
+	poolletutils "github.com/ironcore-dev/ironcore/poollet/common/utils"
 	"github.com/ironcore-dev/ironcore/poollet/machinepoollet/api/v1alpha1"
 	utilclient "github.com/ironcore-dev/ironcore/utils/client"
+	utilsmaps "github.com/ironcore-dev/ironcore/utils/maps"
 	"github.com/ironcore-dev/ironcore/utils/predicates"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
@@ -279,21 +281,18 @@ func (r *ReservationReconciler) reconcile(ctx context.Context, log logr.Logger,
 }
 
 func (r *ReservationReconciler) iriReservationLabels(reservation *computev1alpha1.Reservation) (map[string]string, error) {
-	annotations := map[string]string{
+	labels := map[string]string{
 		v1alpha1.ReservationUIDLabel:       string(reservation.UID),
 		v1alpha1.ReservationNamespaceLabel: reservation.Namespace,
 		v1alpha1.ReservationNameLabel:      reservation.Name,
 	}
 
-	for name, fieldPath := range r.DownwardAPILabels {
-		value, err := fieldpath.ExtractFieldPathAsString(reservation, fieldPath)
-		if err != nil {
-			return nil, fmt.Errorf("error extracting downward api label %q: %w", name, err)
-		}
-
-		annotations[v1alpha1.DownwardAPILabel(name)] = value
+	apiLabels, err := poolletutils.PrepareDownwardAPILabels(reservation, r.DownwardAPILabels, v1alpha1.MachineDownwardAPIPrefix)
+	if err != nil {
+		return nil, err
 	}
-	return annotations, nil
+	labels = utilsmaps.AppendMap(labels, apiLabels)
+	return labels, nil
 }
 
 func (r *ReservationReconciler) iriReservationAnnotations(
@@ -308,7 +307,7 @@ func (r *ReservationReconciler) iriReservationAnnotations(
 			return nil, fmt.Errorf("error extracting downward api annotation %q: %w", name, err)
 		}
 
-		annotations[v1alpha1.DownwardAPIAnnotation(name)] = value
+		annotations[poolletutils.DownwardAPIAnnotation(v1alpha1.MachineDownwardAPIPrefix, name)] = value
 	}
 
 	return annotations, nil

poollet/machinepoollet/controllers/reservation_controller.go

@@ -4,6 +4,8 @@
 package controllers_test
 
 import (
+	"fmt"
+
 	_ "github.com/ironcore-dev/ironcore/api/common/v1alpha1"
 	computev1alpha1 "github.com/ironcore-dev/ironcore/api/compute/v1alpha1"
 	corev1alpha1 "github.com/ironcore-dev/ironcore/api/core/v1alpha1"
@@ -60,7 +62,7 @@ var _ = Describe("MachineController", func() {
 		_, iriReservation := GetSingleMapEntry(srv.Reservations)
 
 		By("inspecting the iri reservation")
-		Expect(iriReservation.Metadata.Labels).To(HaveKeyWithValue(machinepoolletv1alpha1.DownwardAPILabel(fooDownwardAPILabel), fooAnnotationValue))
+		Expect(iriReservation.Metadata.Labels).To(HaveKeyWithValue(fmt.Sprintf("%s%s", machinepoolletv1alpha1.MachineDownwardAPIPrefix, fooDownwardAPILabel), fooAnnotationValue))
 
 		By("setting the reservation state to accepted")
 		iriReservation = &testingmachine.FakeReservation{Reservation: proto.Clone(iriReservation.Reservation).(*iri.Reservation)}