WIP: Seems to label propeerly in a sunny day scenario

config/samples/bmh/bmhLabels

@@ -1,6 +1,6 @@
-k label baremetalhosts -n metal3 --overwrite rdm9r006o001 sip.airshipit.org/rack=r006 sip.airshipit.org/server=rdm9r006o001 airshipit.org/vino-flavor=master sip.airshipit.org/sip-scheduled:false
+kubetcl label baremetalhosts -n metal3 --overwrite rdm9r006o001 sip.airshipit.org/rack=r006 sip.airshipit.org/server=rdm9r006o001 airshipit.org/vino-flavor=master sip.airshipit.org/sip-scheduled=false
-k label baremetalhosts -n metal3 --overwrite rdm9r006o002 sip.airshipit.org/rack=r006 sip.airshipit.org/server=rdm9r006o002 airshipit.org/vino-flavor=master sip.airshipit.org/sip-scheduled:false
+kubetcl label baremetalhosts -n metal3 --overwrite rdm9r006o002 sip.airshipit.org/rack=r006 sip.airshipit.org/server=rdm9r006o002 airshipit.org/vino-flavor=master sip.airshipit.org/sip-scheduled=false
-k label baremetalhosts -n metal3 --overwrite rdm9r007o001 sip.airshipit.org/rack=r007 sip.airshipit.org/server=rdm9r007o001 airshipit.org/vino-flavor=master sip.airshipit.org/sip-scheduled:false
+kubetcl label baremetalhosts -n metal3 --overwrite rdm9r007o001 sip.airshipit.org/rack=r007 sip.airshipit.org/server=rdm9r007o001 airshipit.org/vino-flavor=master sip.airshipit.org/sip-scheduled=false
-k label baremetalhosts -n metal3 --overwrite rdm9r007o002 sip.airshipit.org/rack=r007 sip.airshipit.org/server=rdm9r007o002 airshipit.org/vino-flavor=worker sip.airshipit.org/sip-scheduled:false
+kubetcl label baremetalhosts -n metal3 --overwrite rdm9r007o002 sip.airshipit.org/rack=r007 sip.airshipit.org/server=rdm9r007o002 airshipit.org/vino-flavor=worker sip.airshipit.org/sip-scheduled=false
-k label baremetalhosts -n metal3 --overwrite rdm9r008c002 sip.airshipit.org/rack=r008 sip.airshipit.org/server=rdm9r008c002 airshipit.org/vino-flavor=worker sip.airshipit.org/sip-scheduled:false
+kubetcl label baremetalhosts -n metal3 --overwrite rdm9r008c002 sip.airshipit.org/rack=r008 sip.airshipit.org/server=rdm9r008c002 airshipit.org/vino-flavor=worker sip.airshipit.org/sip-scheduled=false
-k label baremetalhosts -n metal3 --overwrite rdm9r009c002 sip.airshipit.org/rack=r009 sip.airshipit.org/server=rdm9r009c002 airshipit.org/vino-flavor=worker sip.airshipit.org/sip-scheduled:false
+kubetcl label baremetalhosts -n metal3 --overwrite rdm9r009c002 sip.airshipit.org/rack=r009 sip.airshipit.org/server=rdm9r009c002 airshipit.org/vino-flavor=worker sip.airshipit.org/sip-scheduled=false

config/samples/bmh/cleanLabels

@@ -0,0 +1,6 @@
+kubectl label baremetalhosts -n metal3 --overwrite rdm9r006o001 sip.airshipit.org/sip-scheduled=false sip.airshipit.org/note-type- sip.airshipit.org/workload-cluster- sip-scheduled-
+kubectl label baremetalhosts -n metal3 --overwrite rdm9r006o002 sip.airshipit.org/sip-scheduled=false sip.airshipit.org/note-type- sip.airshipit.org/workload-cluster- sip-scheduled-
+kubectl label baremetalhosts -n metal3 --overwrite rdm9r007o001 sip.airshipit.org/sip-scheduled=false sip.airshipit.org/note-type- sip.airshipit.org/workload-cluster- sip-scheduled-
+kubectl label baremetalhosts -n metal3 --overwrite rdm9r007o002 sip.airshipit.org/sip-scheduled=false sip.airshipit.org/note-type- sip.airshipit.org/workload-cluster- sip-scheduled-
+kubectl label baremetalhosts -n metal3 --overwrite rdm9r008c002 sip.airshipit.org/sip-scheduled=false sip.airshipit.org/note-type- sip.airshipit.org/workload-cluster- sip-scheduled-
+kubectl label baremetalhosts -n metal3 --overwrite rdm9r009c002 sip.airshipit.org/sip-scheduled=false sip.airshipit.org/note-type- sip.airshipit.org/workload-cluster- sip-scheduled-

config/samples/bmh/showLabels

@@ -0,0 +1,2 @@
+SCHEDULED=$1
+kubectl get baremetalhosts --all-namespaces -l sip.airshipit.org/sip-scheduled=$SCHEDULED --show-labels|awk '{print $1,$2,$5,$6}'

pkg/controllers/sipcluster_controller.go

@@ -21,7 +21,6 @@ import (
 	"fmt"
 
 	"github.com/go-logr/logr"
-	// "github.com/prometheus/common/log"
 	"k8s.io/apimachinery/pkg/runtime"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -51,7 +50,7 @@ func (r *SIPClusterReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error)
 	// Lets retrieve the SIPCluster
 	sip := airshipv1.SIPCluster{}
 	if err := r.Get(ctx, req.NamespacedName, &sip); err != nil {
-		log.Error(err, "unable to fetch SIP Cluster")
+		//log.Error(err, "unable to fetch SIP Cluster")
 		// we'll ignore not-found errors, since they can't be fixed by an immediate
 		// requeue (we'll need to wait for a new notification), and we can get them
 		// on deleted requests.
@@ -123,6 +122,7 @@ func (r *SIPClusterReconciler) gatherVBMH(sip airshipv1.SIPCluster) (error, *air
 
 	// we extract the information in a generic way
 	// So that LB ,  Jump and Ath POD  all leverage the same
+	// If there are some issues finnding information then the machines ??
 	fmt.Printf("gatherVBMH.Extrapolate sip:%v machines:%v\n", sip, machines)
 	err = machines.Extrapolate(sip, r.Client)
 	if err != nil {

pkg/vbmh/machines.go

@@ -73,7 +73,7 @@ const (
 // attributes required to manage the SIP Cluster scheduling and
 // rocesing needs about thhem
 type Machine struct {
-	Bmh            *metal3.BareMetalHost
+	Bmh            metal3.BareMetalHost
 	ScheduleStatus ScheduledState
 	// scheduleLabels
 	// I expect to build this over time / if not might not be needed
@@ -84,6 +84,21 @@ type Machine struct {
 	Data *MachineData
 }
 
+func (m *Machine) String() string {
+	return fmt.Sprintf("Machine {\n\tBmh:%s\n\tScheduleStatus:%s\n\tVmRole:%v\n}\n", m.Bmh.ObjectMeta.Name, m.ScheduleStatus, m.VmRole)
+}
+
+func NewMachine(bmh metal3.BareMetalHost, nodeRole airshipv1.VmRoles) (m *Machine) {
+	return &Machine{
+		Bmh:            bmh,
+		ScheduleStatus: ToBeScheduled,
+		VmRole:         nodeRole,
+		Data: &MachineData{
+			IpOnInterface: make(map[string]string),
+		},
+	}
+}
+
 type MachineData struct {
 	// Collect all IP's for the interfaces defined
 	// In the list of Services
@@ -92,7 +107,27 @@ type MachineData struct {
 
 // MachineList contains the list of Scheduled or ToBeScheduled machines
 type MachineList struct {
-	bmhs []*Machine
+	bmhs map[string]*Machine
+}
+
+func (ml *MachineList) hasMachine(bmh metal3.BareMetalHost) bool {
+
+	if &bmh == nil {
+		return false
+	}
+	fmt.Printf("Schedule.hasMachine  bmh.ObjectMeta.Name:%s ml.bmhs[bmh.ObjectMeta.Name] :%v , answer :%t \n", bmh.ObjectMeta.Name, ml.bmhs[bmh.ObjectMeta.Name], (ml.bmhs[bmh.ObjectMeta.Name] != nil))
+	return ml.bmhs[bmh.ObjectMeta.Name] != nil
+}
+
+func (ml *MachineList) String() string {
+	var sb strings.Builder
+
+	for mName, machine := range ml.bmhs {
+
+		sb.WriteString("[" + mName + "]:" + machine.String())
+	}
+
+	return sb.String()
 }
 
 func (ml *MachineList) Schedule(sip airshipv1.SIPCluster, c client.Client) error {
@@ -119,14 +154,14 @@ func (ml *MachineList) Schedule(sip airshipv1.SIPCluster, c client.Client) error
 	return nil
 }
 
-func (ml *MachineList) init(nodes map[airshipv1.VmRoles]airshipv1.NodeSet) []*Machine {
+func (ml *MachineList) init(nodes map[airshipv1.VmRoles]airshipv1.NodeSet) map[string]*Machine {
 	mlSize := 0
 	for _, nodeCfg := range nodes {
 		mlSize = mlSize + nodeCfg.Count.Active + nodeCfg.Count.Standby
 	}
 	//fmt.Printf("Schedule.init mlSize:%d\n", mlSize)
 
-	return make([]*Machine, 0)
+	return make(map[string]*Machine, 0)
 
 }
 
@@ -175,7 +210,7 @@ func (ml *MachineList) identifyNodes(sip airshipv1.SIPCluster, bmhList *metal3.B
 			return err
 		}
 	}
-	fmt.Printf("Schedule.identifyNodes ml.bmhs size:%d\n", len(ml.bmhs))
+	fmt.Printf("Schedule.identifyNodes %s size:%d\n", ml.String(), len(ml.bmhs))
 	return nil
 }
 
@@ -229,7 +264,8 @@ func (ml *MachineList) scheduleIt(nodeRole airshipv1.VmRoles, nodeCfg airshipv1.
 
 	fmt.Printf("Schedule.scheduleIt  nodeRole:%v nodeTarget:%d nodeCfg.VmFlavor:%s  ml.bmhs len:%d \n", nodeRole, nodeTarget, nodeCfg.VmFlavor, len(ml.bmhs))
 	for _, bmh := range bmList.Items {
-		//fmt.Printf("---------------\n Schedule.scheduleIt  bmh.ObjectMeta.Name:%s \n", bmh.ObjectMeta.Name)
+		fmt.Printf("---------------\n Schedule.scheduleIt  bmh.ObjectMeta.Name:%s \n", bmh.ObjectMeta.Name)
+
 		for _, constraint := range nodeCfg.Scheduling {
 			// Do I care about this constraint
 
@@ -255,22 +291,14 @@ func (ml *MachineList) scheduleIt(nodeRole airshipv1.VmRoles, nodeCfg airshipv1.
 
 			}
 		}
-		//fmt.Printf("Schedule.scheduleIt nodeTarget:%d, validBmh:%t  ml.bmhs len:%d\n", nodeTarget, validBmh, len(ml.bmhs))
+		fmt.Printf("Schedule.scheduleIt validBmh:%t, bmh.ObjectMeta.Name:%s  ml.bmhs len:%d\n", validBmh, bmh.ObjectMeta.Name, len(ml.bmhs))
 		// All the constraints have been checked
-		if validBmh {
+		// Only if its not in the list already
+		if validBmh && !ml.hasMachine(bmh) {
 			// Lets add it to the list as a schedulable thing
-			m := &Machine{
+			ml.bmhs[bmh.ObjectMeta.Name] = NewMachine(bmh, nodeRole)
-				Bmh:            &bmh,
+			fmt.Printf("---------------\nSchedule.scheduleIt ADDED machine:%s ml.bmhs %s \n", ml.bmhs[bmh.ObjectMeta.Name].String())
-				ScheduleStatus: ToBeScheduled,
+			// TODO Probable should remove the bmh from the list so if there are other node targets they dont even take it into account
-				VmRole:         nodeRole,
-				Data: &MachineData{
-					IpOnInterface: make(map[string]string),
-				},
-			}
-			// Probable need to use the nodeRole as a label here
-			ml.bmhs = append(ml.bmhs, m)
-			fmt.Printf("---------------\nSchedule.scheduleIt ADDED  bmh.ObjectMeta.Name:%s  ml.bmhs len:%d machine:%v \n", bmh.ObjectMeta.Name, len(ml.bmhs), m)
-			// TODO Probablle should remove the bmh from the list so if there are other node targtes they dont even take it into account
 			nodeTarget = nodeTarget - 1
 			if nodeTarget == 0 {
 				break
@@ -281,7 +309,7 @@ func (ml *MachineList) scheduleIt(nodeRole airshipv1.VmRoles, nodeCfg airshipv1.
 		validBmh = true
 	}
 
-	fmt.Printf("Schedule.scheduleIt  nodeTarget:%d, ml.bmhs:%d\n", nodeTarget, len(ml.bmhs))
+	fmt.Printf("Schedule.scheduleIt nodeRole:%v nodeTarget:%d\n %s\n", nodeRole, nodeTarget, ml.String())
 	if nodeTarget > 0 {
 		return ErrorUnableToFullySchedule{
 			TargetNode:   nodeRole,
@@ -554,9 +582,12 @@ have benn selected by the scheduling.
 This is done only after the Infrastcuture Services have been  deployed
 */
 func (ml *MachineList) ApplyLabels(sip airshipv1.SIPCluster, c client.Client) error {
+
+	fmt.Printf("ApplyLabels  %s size:%d\n", ml.String(), len(ml.bmhs))
 	for _, machine := range ml.bmhs {
-		fmt.Printf("Apply  machine:%v\n", machine)
+
-		bmh := machine.Bmh
+		bmh := &machine.Bmh
+		fmt.Printf("ApplyLabels bmh.ObjectMeta.Name:%s\n", bmh.ObjectMeta.Name)
 		bmh.Labels[SipClusterLabel] = sip.Spec.Config.ClusterName
 		bmh.Labels[SipScheduleLabel] = "true"
 		bmh.Labels[SipNodeTypeLabel] = string(machine.VmRole)