🐛 Only wait for api server pod healthy condition if cluster control plane is kubeadm-based (#1607)

xDev789 · guettli · web-flow · commit 38f29383581b · 2025-06-12T14:50:35.000+02:00
Only wait for api server pod healthy condition if cluster control plane is kubeadm-based

Co-authored-by: Thomas Güttler &lt;thomas.guettler@syself.com&gt;
diff --git a/pkg/services/hcloud/server/server.go b/pkg/services/hcloud/server/server.go
@@ -311,9 +311,12 @@ func (s *Service) reconcileLoadBalancerAttachment(ctx context.Context, server *h
 		return reconcile.Result{}, nil
 	}
 
+	apiServerPodHealthy := s.scope.Cluster.Spec.ControlPlaneRef == nil ||
+		s.scope.Cluster.Spec.ControlPlaneRef.Kind != "KubeadmControlPlane" ||
+		conditions.IsTrue(s.scope.Machine, controlplanev1.MachineAPIServerPodHealthyCondition)
+
 	// we attach only nodes with kube-apiserver pod healthy to avoid downtime, skipped for the first node
-	if len(s.scope.HetznerCluster.Status.ControlPlaneLoadBalancer.Target) > 0 &&
-		!conditions.IsTrue(s.scope.Machine, controlplanev1.MachineAPIServerPodHealthyCondition) {
+	if len(s.scope.HetznerCluster.Status.ControlPlaneLoadBalancer.Target) > 0 && !apiServerPodHealthy {
 		return reconcile.Result{RequeueAfter: 30 * time.Second}, nil
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -311,9 +311,12 @@ func (s Service) reconcileLoadBalancerAttachment(ctx context.Context, server h`
`311`	`311`	`return reconcile.Result{}, nil`
`312`	`312`	`}`
`313`	`313`
	`314`	`+ apiServerPodHealthy := s.scope.Cluster.Spec.ControlPlaneRef == nil \|\|`
	`315`	`+ s.scope.Cluster.Spec.ControlPlaneRef.Kind != "KubeadmControlPlane" \|\|`
	`316`	`+ conditions.IsTrue(s.scope.Machine, controlplanev1.MachineAPIServerPodHealthyCondition)`
	`317`	`+`
`314`	`318`	`// we attach only nodes with kube-apiserver pod healthy to avoid downtime, skipped for the first node`
`315`		`- if len(s.scope.HetznerCluster.Status.ControlPlaneLoadBalancer.Target) > 0 &&`
`316`		`- !conditions.IsTrue(s.scope.Machine, controlplanev1.MachineAPIServerPodHealthyCondition) {`
	`319`	`+ if len(s.scope.HetznerCluster.Status.ControlPlaneLoadBalancer.Target) > 0 && !apiServerPodHealthy {`
`317`	`320`	`return reconcile.Result{RequeueAfter: 30 * time.Second}, nil`
`318`	`321`	`}`
`319`	`322`