Save updated cluster status

Author: deitch

pkg/cloud/packet/actuators/cluster/actuator.go

@@ -19,6 +19,7 @@ package cluster
 import (
 	"fmt"
 	"log"
+	"reflect"
 
 	"github.com/packethost/cluster-api-provider-packet/pkg/cloud/packet/ca"
 	"github.com/packethost/cluster-api-provider-packet/pkg/cloud/packet/deployer"
@@ -52,6 +53,8 @@ func NewActuator(params ActuatorParams) (*Actuator, error) {
 // Reconcile reconciles a cluster and is invoked by the Cluster Controller
 func (a *Actuator) Reconcile(cluster *clusterv1.Cluster) error {
 	log.Printf("Reconciling cluster %v.", cluster.Name)
+	// save the original status
+	clusterCopy := cluster.DeepCopy()
 	// ensure that we have a CA cert/key and save it
 	if cert, _ := a.deployer.GetCA(cluster.Name); cert == nil {
 		caCertAndKey, err := ca.GenerateCACertAndKey(cluster.Name, "")
@@ -63,6 +66,39 @@ func (a *Actuator) Reconcile(cluster *clusterv1.Cluster) error {
 			return fmt.Errorf("unable to save CA cert and key: %v", err)
 		}
 	}
+	// ensure that we save the correct IP address for the cluster
+	address, err := a.deployer.GetIP(cluster, nil)
+	_, isNoMachine := err.(*deployer.MachineNotFound)
+	_, isNoIP := err.(*deployer.MachineNoIP)
+	switch {
+	case err != nil && isNoMachine:
+		return nil
+	case err != nil && isNoIP:
+		return nil
+	case err != nil:
+		return err
+	case err == nil:
+		cluster.Status.APIEndpoints = []clusterv1.APIEndpoint{
+			{
+				Host: address,
+				Port: a.deployer.ControlPort,
+			},
+		}
+	}
+
+	var clusterClient client.ClusterInterface
+	if a.clustersGetter != nil {
+		clusterClient = a.clustersGetter.Clusters(cluster.Namespace)
+	}
+	if !reflect.DeepEqual(cluster.Status, clusterCopy.Status) {
+		log.Printf("saving updated cluster status %s", cluster.Name)
+		if _, err := clusterClient.UpdateStatus(cluster); err != nil {
+			msg := fmt.Sprintf("failed to save updated cluster status %s: %v", cluster.Name, err)
+			log.Printf(msg)
+			return fmt.Errorf(msg)
+		}
+	}
+
 	return nil
 }
 

pkg/cloud/packet/deployer/deploy.go

@@ -105,10 +105,10 @@ func (d *Deployer) GetIP(cluster *clusterv1.Cluster, machine *clusterv1.Machine)
 		return "", fmt.Errorf("error retrieving machine status %s: %v", machineRef, err)
 	}
 	if device == nil {
-		return "", fmt.Errorf("machine does not exist: %s", machineRef)
+		return "", &MachineNotFound{err: fmt.Sprintf("machine does not exist: %s", machineRef)}
 	}
 	if device.Network == nil || len(device.Network) == 0 || device.Network[0].Address == "" {
-		return "", fmt.Errorf("machine does not yet have an IP address: %s", machineRef)
+		return "", &MachineNoIP{err: fmt.Sprintf("machine does not yet have an IP address: %s", machineRef)}
 	}
 	// TODO: validate that this address exists, so we don't hit nil pointer
 	// TODO: check which address to return

pkg/cloud/packet/deployer/error.go

@@ -0,0 +1,19 @@
+package deployer
+
+// MachineNotFound error representing that the requested device was not yet found
+type MachineNotFound struct {
+	err string
+}
+
+func (e *MachineNotFound) Error() string {
+	return e.err
+}
+
+// MachineNoIP error representing that the requested device does not have an IP yet assigned
+type MachineNoIP struct {
+	err string
+}
+
+func (e *MachineNoIP) Error() string {
+	return e.err
+}