Set maintenance needed label on ServerClaim

Author: defo89

internal/controller/servermaintenance_controller.go

@@ -136,6 +136,9 @@ func (r *ServerMaintenanceReconciler) handlePendingState(ctx context.Context, lo
 	annotations := map[string]string{
 		metalv1alpha1.ServerMaintenanceNeededLabelKey: "true",
 	}
+	labels := map[string]string{
+		metalv1alpha1.ServerMaintenanceNeededLabelKey: "true",
+	}
 	if maintenance.Annotations[metalv1alpha1.ServerMaintenanceReasonAnnotationKey] != "" {
 		annotations[metalv1alpha1.ServerMaintenanceReasonAnnotationKey] = maintenance.Annotations[metalv1alpha1.ServerMaintenanceReasonAnnotationKey]
 	}
@@ -144,6 +147,11 @@ func (r *ServerMaintenanceReconciler) handlePendingState(ctx context.Context, lo
 	}
 	log.V(1).Info("Patched ServerClaim annotations", "ServerClaim", client.ObjectKeyFromObject(serverClaim))
 
+	if err := r.patchServerClaimLabels(ctx, serverClaim, labels); err != nil {
+		return ctrl.Result{}, fmt.Errorf("failed to patch server claim labels: %w", err)
+	}
+	log.V(1).Info("Patched ServerClaim labels", "ServerClaim", client.ObjectKeyFromObject(serverClaim))
+
 	if maintenance.Spec.Policy == metalv1alpha1.ServerMaintenancePolicyOwnerApproval {
 		annotations := serverClaim.GetAnnotations()
 		if _, ok := annotations[metalv1alpha1.ServerMaintenanceApprovalKey]; !ok {
@@ -349,6 +357,9 @@ func (r *ServerMaintenanceReconciler) cleanup(ctx context.Context, log logr.Logg
 		metalv1alpha1.ServerMaintenanceNeededLabelKey,
 		metalv1alpha1.ServerMaintenanceReasonAnnotationKey,
 	})
+	metautils.DeleteLabels(serverClaim, []string{
+		metalv1alpha1.ServerMaintenanceNeededLabelKey,
+	})
 	if err := r.Patch(ctx, serverClaim, client.MergeFrom(serverClaimBase)); err != nil {
 		return fmt.Errorf("failed to patch ServerClaim annotations: %w", err)
 	}
@@ -403,6 +414,18 @@ func (r *ServerMaintenanceReconciler) patchServerClaimAnnotations(ctx context.Co
 	return nil
 }
 
+func (r *ServerMaintenanceReconciler) patchServerClaimLabels(ctx context.Context, claim *metalv1alpha1.ServerClaim, set map[string]string) error {
+	if claim == nil {
+		return fmt.Errorf("ServerClaim is nil")
+	}
+	claimBase := claim.DeepCopy()
+	metautils.SetLabels(claim, set)
+	if err := r.Patch(ctx, claim, client.MergeFrom(claimBase)); err != nil {
+		return fmt.Errorf("failed to patch ServerClaim labels: %w", err)
+	}
+	return nil
+}
+
 func (r *ServerMaintenanceReconciler) enqueueMaintenanceByServerRefs() handler.EventHandler {
 	return handler.EnqueueRequestsFromMapFunc(func(ctx context.Context, object client.Object) []reconcile.Request {
 		log := ctrl.LoggerFrom(ctx)

internal/controller/servermaintenance_controller_test.go

@@ -178,9 +178,10 @@ var _ = Describe("ServerMaintenance Controller", func() {
 			HaveField("Status.State", metalv1alpha1.ServerMaintenanceStatePending),
 		))
 
-		By("Ensuring that the ServerClaim has the maintenance needed annotation")
+		By("Ensuring that the ServerClaim has the maintenance needed label and annotation")
 		Eventually(Object(serverClaim)).Should(SatisfyAll(
 			HaveField("ObjectMeta.Annotations", HaveKeyWithValue(metalv1alpha1.ServerMaintenanceNeededLabelKey, "true")),
+			HaveField("ObjectMeta.Labels", HaveKeyWithValue(metalv1alpha1.ServerMaintenanceNeededLabelKey, "true")),
 		))
 
 		By("Checking the Server is not in maintenance")
@@ -193,11 +194,14 @@ var _ = Describe("ServerMaintenance Controller", func() {
 			metautils.SetAnnotation(serverClaim, metalv1alpha1.ServerMaintenanceApprovalKey, "true")
 		})).Should(Succeed())
 
-		maintenanceLabels := map[string]string{
+		maintenanceAnnotations := map[string]string{
 			metalv1alpha1.ServerMaintenanceNeededLabelKey:      "true",
 			metalv1alpha1.ServerMaintenanceReasonAnnotationKey: "test-maintenance",
 			metalv1alpha1.ServerMaintenanceApprovalKey:         "true",
 		}
+		maintenanceLabels := map[string]string{
+			metalv1alpha1.ServerMaintenanceNeededLabelKey:      "true",
+		}
 		Eventually(Object(server)).Should(SatisfyAll(
 			HaveField("Spec.ServerMaintenanceRef.Name", serverMaintenance.Name),
 			HaveField("Spec.MaintenanceBootConfigurationRef", Not(BeNil())),
@@ -222,9 +226,10 @@ var _ = Describe("ServerMaintenance Controller", func() {
 			HaveField("Status.State", metalv1alpha1.ServerStateMaintenance),
 		))
 
-		By("Checking the ServerClaim has the maintenance labels")
+		By("Checking the ServerClaim has the maintenance labels and annotations")
 		Eventually(Object(serverClaim)).Should(SatisfyAll(
-			HaveField("ObjectMeta.Annotations", maintenanceLabels),
+			HaveField("ObjectMeta.Annotations", maintenanceAnnotations),
+			HaveField("ObjectMeta.Labels", maintenanceLabels),
 		))
 
 		By("Checking the ServerMaintenance is in maintenance")
@@ -245,6 +250,7 @@ var _ = Describe("ServerMaintenance Controller", func() {
 		By("Checking the ServerClaim is cleaned up")
 		Eventually(Object(serverClaim)).Should(SatisfyAll(
 			HaveField("ObjectMeta.Annotations", Not(HaveKey(metalv1alpha1.ServerMaintenanceNeededLabelKey))),
+			HaveField("ObjectMeta.Labels", Not(HaveKey(metalv1alpha1.ServerMaintenanceNeededLabelKey))),
 		))
 
 		By("Deleting the ServerClaim")