Output converging machine names

Signed-off-by: JoshVanL <vleeuwenjoshua@gmail.com>

Author: JoshVanL

pkg/tarmak/cluster/configuration.go

@@ -11,6 +11,7 @@ import (
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
+	"github.com/jetstack/tarmak/pkg/apis/wing/common"
 	wingv1alpha1 "github.com/jetstack/tarmak/pkg/apis/wing/v1alpha1"
 )
 
@@ -145,7 +146,10 @@ func (c *Cluster) WaitForConvergance() error {
 
 			var convergingMachines []string
 			for _, m := range mList.Items {
-				convergingMachines = append(convergingMachines, m.Name)
+				if m.Status == nil || m.Status.Converge == nil ||
+					m.Status.Converge.State != common.MachineManifestStateConverged {
+					convergingMachines = append(convergingMachines, m.Name)
+				}
 			}
 
 			reps := d.Status.Replicas

pkg/wing/controller/machinedeployment/controller.go

@@ -132,7 +132,7 @@ func (c *Controller) createControlledMachineSet(md *v1alpha1.MachineDeployment)
 		maxReplicas = *md.Spec.MaxReplicas
 	}
 
-	c.log.Infof("Creating MachineSet for MachineDeployment %s\n", md.Name)
+	c.log.Infof("Creating MachineSet from MachineDeployment %s\n", md.Name)
 	ms := &v1alpha1.MachineSet{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:   md.Name,

pkg/wing/controller/machineset/controller.go

@@ -33,7 +33,7 @@ func NewController(queue workqueue.RateLimitingInterface, indexer cache.Indexer,
 		informer: informer,
 		indexer:  indexer,
 		queue:    queue,
-		log:      logrus.NewEntry(logrus.New()).WithField("tier", "controller"),
+		log:      logrus.NewEntry(logrus.New()).WithField("tier", "MachineSet-controller"),
 		client:   client,
 	}
 }
@@ -80,7 +80,6 @@ func (c *Controller) syncToStdout(key string) error {
 
 	// machineset doesn't exist for this machine
 	if !found {
-		c.log.Warnf("did not find machineset for machine %s", m.Name)
 		return nil
 	}