update status and ACP separately

Signed-off-by: Riccardo Piccoli <[email protected]>
openshift-assisted · May 14, 2024 · 9ad93a5 · 9ad93a5
1 parent d627993
commit 9ad93a5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 13 deletions.
diff --git a/bootstrap/internal/controller/agentclusterinstall_controller.go b/bootstrap/internal/controller/agentclusterinstall_controller.go
@@ -188,12 +188,6 @@ func (r *AgentClusterInstallReconciler) labelWorkloadClusterNodes(ctx context.Co
 			log.Error(err, "error trying to update machine", "op", op, "machine", machine.Name)
 			return err
 		}
-		log.Info("set providerID successfully", "op", op, "machine", machine.Name)
-		if err := r.setNodeMetadata(ctx, targetClient, node, machine, bmhUID); err != nil {
-			log.Info("could not set node metadata", "name", node.Name)
-		} else {
-			log.Info("set node metadata", "name", node.Name)
-		}
 	}
 	return nil
 }

diff --git a/controlplane/api/v1beta1/agentcontrolplane_types.go b/controlplane/api/v1beta1/agentcontrolplane_types.go
@@ -24,10 +24,6 @@ import (
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 )
 
-const (
-	AgentClusterConfigurationAnnotation = "controlplane.cluster.x-k8s.io/kubeadm-cluster-configuration"
-)
-
 // EDIT THIS FILE!  THIS IS SCAFFOLDING FOR YOU TO OWN!
 // NOTE: json tags are required.  Any new fields you add must have json tags for the fields to be serialized.
 

diff --git a/controlplane/internal/controller/agentcontrolplane_controller.go b/controlplane/internal/controller/agentcontrolplane_controller.go
@@ -93,9 +93,6 @@ func (r *AgentControlPlaneReconciler) Reconcile(ctx context.Context, req ctrl.Re
 		return ctrl.Result{}, err
 	}
 	defer func() {
-		if rerr = r.Client.Update(ctx, acp); rerr != nil {
-			log.Error(rerr, "couldn't update AgentControlPlane", "name", acp.Name, "namespace", acp.Namespace)
-		}
 		if rerr = r.Client.Status().Update(ctx, acp); rerr != nil {
 			log.Error(rerr, "couldn't update AgentControlPlane Status", "name", acp.Name, "namespace", acp.Namespace)
 		}
@@ -140,6 +137,10 @@ func (r *AgentControlPlaneReconciler) Reconcile(ctx context.Context, req ctrl.Re
 				Kind:       "ClusterDeployment",
 				APIVersion: hivev1.SchemeGroupVersion.String(),
 			}
+			if err = r.Client.Update(ctx, acp); err != nil {
+				log.Error(rerr, "couldn't update AgentControlPlane", "name", acp.Name, "namespace", acp.Namespace)
+				return ctrl.Result{}, err
+			}
 		}
 	}