Fix BMC reconciliation and print columns (#30)

ironcore-dev · Apr 29, 2024 · 57f46ef · 57f46ef
1 parent 8f285df
commit 57f46ef
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 5 deletions.
diff --git a/api/v1alpha1/bmc_types.go b/api/v1alpha1/bmc_types.go
@@ -106,7 +106,6 @@ const (
 // +kubebuilder:resource:scope=Cluster
 // +kubebuilder:printcolumn:name="MACAddress",type=string,JSONPath=`.status.macAddress`
 // +kubebuilder:printcolumn:name="MACAddress",type=string,JSONPath=`.status.ip`
-// +kubebuilder:printcolumn:name="Manufacturer",type=string,JSONPath=`.status.manufacturer`
 // +kubebuilder:printcolumn:name="Model",type=string,JSONPath=`.status.model`
 // +kubebuilder:printcolumn:name="SKU",type=string,JSONPath=`.status.sku`,priority=100
 // +kubebuilder:printcolumn:name="SerialNumber",type=string,JSONPath=`.status.serialNumber`,priority=100

diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/internal/controller/bmc_controller.go b/internal/controller/bmc_controller.go
@@ -185,7 +185,8 @@ func (r *BMCReconciler) discoverServers(ctx context.Context, bmcObj *metalv1alph
 func (r *BMCReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewControllerManagedBy(mgr).
 		For(&metalv1alpha1.BMC{}).
-		Owns(&metalv1alpha1.Server{}).
+		// TODO: don't recreate Server if deleted manually
+		//Owns(&metalv1alpha1.Server{}).
 		// TODO: add watches for Endpoints and BMCSecrets
 		Complete(r)
 }
diff --git a/internal/controller/server_controller.go b/internal/controller/server_controller.go
@@ -251,7 +251,6 @@ func (r *ServerReconciler) ensureServerStateTransition(ctx context.Context, log
 		}
 		log.V(1).Info("Reconciled available state")
 	case metalv1alpha1.ServerStateReserved:
-
 		if err := r.updateServerStatus(ctx, log, server); err != nil {
 			return false, err
 		}

diff --git a/internal/controller/server_controller_test.go b/internal/controller/server_controller_test.go
@@ -156,7 +156,7 @@ var _ = Describe("Server Controller", func() {
 				Name:      server.Name,
 			},
 		}
-		Eventually(Get(config)).Should(Satisfy(apierrors.IsNotFound))
+		Consistently(Get(config)).Should(Satisfy(apierrors.IsNotFound))
 	})
 
 	// TODO: test server with manual BMC registration