PCP-2585: MAAS cluster is stuck in provisioning if customEndpoint is …

…present and customEndpointPort is not present (#140)
spectrocloud · Mar 6, 2024 · 1838d1f · 1838d1f
1 parent 75814d1
commit 1838d1f
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/pkg/maas/scope/cluster.go b/pkg/maas/scope/cluster.go
@@ -119,13 +119,14 @@ func (s *ClusterScope) Close() error {
 
 // APIServerPort returns the APIServerPort to use when creating the load balancer.
 func (s *ClusterScope) APIServerPort() int {
-	if s.Cluster.Spec.ClusterNetwork != nil && s.Cluster.Spec.ClusterNetwork.APIServerPort != nil {
-		return int(*s.Cluster.Spec.ClusterNetwork.APIServerPort)
-	}
 
-	if infrautil.IsCustomEndpointPresent(s.MaasCluster.GetAnnotations()) {
+	if infrautil.IsCustomEndpointPresent(s.MaasCluster.GetAnnotations()) && s.MaasCluster.Spec.ControlPlaneEndpoint.Port != 0 {
 		return s.MaasCluster.Spec.ControlPlaneEndpoint.Port
 	}
+
+	if s.Cluster.Spec.ClusterNetwork != nil && s.Cluster.Spec.ClusterNetwork.APIServerPort != nil {
+		return int(*s.Cluster.Spec.ClusterNetwork.APIServerPort)
+	}
 	return 6443
 }