pull from upstream

cmd/manager/main.go

@@ -25,6 +25,7 @@ import (
 	bmoapis "github.com/metal3-io/baremetal-operator/pkg/apis"
 	"github.com/metal3-io/cluster-api-provider-baremetal/pkg/apis"
 	"github.com/metal3-io/cluster-api-provider-baremetal/pkg/cloud/baremetal/actuators/machine"
+	"github.com/metal3-io/cluster-api-provider-baremetal/pkg/manager/wrapper"
 	clusterapis "github.com/openshift/cluster-api/pkg/apis"
 	capimachine "github.com/openshift/cluster-api/pkg/controller/machine"
 	"k8s.io/apimachinery/pkg/runtime/schema"
@@ -93,7 +94,8 @@ func main() {
 		panic(err)
 	}
 
-	capimachine.AddWithActuator(mgr, machineActuator)
+	// the manager wrapper will add an extra Watch to the controller
+	capimachine.AddWithActuator(wrapper.New(mgr), machineActuator)
 
 	if err := mgr.Start(signals.SetupSignalHandler()); err != nil {
 		entryLog.Error(err, "unable to run manager")

pkg/cloud/baremetal/actuators/machine/actuator.go

@@ -144,17 +144,34 @@ func (a *Actuator) Delete(ctx context.Context, cluster *clusterv1.Cluster, machi
 	if err != nil {
 		return err
 	}
-	if host != nil && host.Spec.MachineRef != nil {
-		// don't remove the MachineRef if it references some other machine
-		if host.Spec.MachineRef.Name == machine.Name {
-			host.Spec.MachineRef = nil
+	if host != nil && host.Spec.ConsumerRef != nil {
+		// don't remove the ConsumerRef if it references some other machine
+		if !consumerRefMatches(host.Spec.ConsumerRef, machine) {
+			log.Printf("host associated with %v, not machine %v.",
+				host.Spec.ConsumerRef.Name, machine.Name)
+			return nil
+		}
+		if host.Spec.Image != nil || host.Spec.Online || host.Spec.UserData != nil {
 			host.Spec.Image = nil
 			host.Spec.Online = false
 			host.Spec.UserData = nil
 			err = a.client.Update(ctx, host)
 			if err != nil && !errors.IsNotFound(err) {
 				return err
 			}
+			return &clustererror.RequeueAfterError{}
+		}
+		switch host.Status.Provisioning.State {
+		default:
+			return &clustererror.RequeueAfterError{RequeueAfter: requeueAfter}
+		case bmh.StateRegistrationError, bmh.StateRegistering,
+			bmh.StateMatchProfile, bmh.StateInspecting,
+			bmh.StateReady, bmh.StateValidationError:
+			host.Spec.ConsumerRef = nil
+			err = a.client.Update(ctx, host)
+			if err != nil && !errors.IsNotFound(err) {
+				return err
+			}
 		}
 	}
 	log.Printf("finished deleting machine %v.", machine.Name)
@@ -309,8 +326,8 @@ func (a *Actuator) chooseHost(ctx context.Context, machine *machinev1.Machine,
 			} else {
 				log.Printf("Host '%s' did not match hostSelector for Machine '%s'", host.Name, machine.Name)
 			}
-		} else if host.Spec.MachineRef != nil && host.Spec.MachineRef.Name == machine.Name && host.Spec.MachineRef.Namespace == machine.Namespace {
-			log.Printf("found host %s with existing MachineRef", host.Name)
+		} else if host.Spec.ConsumerRef != nil && consumerRefMatches(host.Spec.ConsumerRef, machine) {
+			log.Printf("found host %s with existing ConsumerRef", host.Name)
 			return &hosts.Items[i], nil
 		}
 	}
@@ -326,15 +343,35 @@ func (a *Actuator) chooseHost(ctx context.Context, machine *machinev1.Machine,
 	return chosenHost, nil
 }
 
+// consumerRefMatches returns a boolean based on whether the consumer
+// reference and machine metadata match
+func consumerRefMatches(consumer *corev1.ObjectReference, machine *machinev1.Machine) bool {
+	if consumer.Name != machine.Name {
+		return false
+	}
+	if consumer.Namespace != machine.Namespace {
+		return false
+	}
+	if consumer.Kind != machine.Kind {
+		return false
+	}
+	if consumer.APIVersion != machine.APIVersion {
+		return false
+	}
+	return true
+}
+
 // setHostSpec will ensure the host's Spec is set according to the machine's
 // details. It will then update the host via the kube API. If UserData does not
 // include a Namespace, it will default to the Machine's namespace.
 func (a *Actuator) setHostSpec(ctx context.Context, host *bmh.BareMetalHost, machine *machinev1.Machine,
 	config *bmv1alpha1.BareMetalMachineProviderSpec) error {
 
-	host.Spec.MachineRef = &corev1.ObjectReference{
-		Name:      machine.Name,
-		Namespace: machine.Namespace,
+	host.Spec.ConsumerRef = &corev1.ObjectReference{
+		Kind:       "Machine",
+		Name:       machine.Name,
+		Namespace:  machine.Namespace,
+		APIVersion: machine.APIVersion,
 	}
 
 	host.Spec.Image = &bmh.Image{
@@ -465,5 +502,12 @@ func (a *Actuator) nodeAddresses(host *bmh.BareMetalHost) ([]corev1.NodeAddress,
 		addrs = append(addrs, address)
 	}
 
+	if host.Status.HardwareDetails.Hostname != "" {
+		addrs = append(addrs, corev1.NodeAddress{
+			Type:    corev1.NodeHostName,
+			Address: host.Status.HardwareDetails.Hostname,
+		})
+	}
+
 	return addrs, nil
 }