fix api port issue (#459)

kubernetes-sigs · Sep 5, 2019 · 005d712 · 005d712
1 parent 54bb062
commit 005d712
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/controllers/openstackcluster_controller.go b/controllers/openstackcluster_controller.go
@@ -170,10 +170,17 @@ func (r *OpenStackClusterReconciler) reconcileCluster(logger logr.Logger, cluste
 			return reconcile.Result{}, errors.Errorf("failed to get control plane machine: %v", err)
 		}
 		if controlPlaneMachine != nil {
+			var apiPort int
+			if cluster.Spec.ClusterNetwork.APIServerPort == nil {
+				logger.Info("No API endpoint given, default to 6443")
+				apiPort = 6443
+			} else {
+				apiPort = int(*cluster.Spec.ClusterNetwork.APIServerPort)
+			}
 			openStackCluster.Status.APIEndpoints = []infrav1.APIEndpoint{
 				{
 					Host: controlPlaneMachine.Spec.FloatingIP,
-					Port: int(*cluster.Spec.ClusterNetwork.APIServerPort),
+					Port: apiPort,
 				},
 			}
 		} else {

diff --git a/examples/cluster/cluster.yaml b/examples/cluster/cluster.yaml
@@ -15,7 +15,7 @@ spec:
     # * Disable the apiServerPort property
     # single-node control-plane:
     # * Enable the apiServerPort property
-    #apiServerPort: 6443
+    apiServerPort: <disable when multi-node control-plane>
   infrastructureRef:
     apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2
     kind: OpenStackCluster