Converge machines

jetstack · Jul 24, 2018 · 98d321f · 98d321f
1 parent 85a3446
commit 98d321f
Show file tree

Hide file tree

Showing 4 changed files with 85 additions and 84 deletions.
diff --git a/pkg/wing/convergemachine.go b/pkg/wing/convergemachine.go
@@ -0,0 +1,85 @@
+package wing
+
+import (
+	"fmt"
+
+	"github.com/jetstack/tarmak/pkg/apis/wing/v1alpha1"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+func (w *Wing) convergeMachine() error {
+	machineAPI := w.clientset.WingV1alpha1().Machines(w.flags.ClusterName)
+	machine, err := machineAPI.Get(
+		w.flags.InstanceName,
+		metav1.GetOptions{},
+	)
+	if err != nil {
+		if kerr, ok := err.(*apierrors.StatusError); ok && kerr.ErrStatus.Reason == metav1.StatusReasonNotFound {
+			machine = &v1alpha1.Machine{
+				ObjectMeta: metav1.ObjectMeta{
+					Name: w.flags.InstanceName,
+				},
+				Status: v1alpha1.MachineStatus{
+					Converged: false,
+				},
+			}
+			_, err := machineAPI.Create(machine)
+			if err != nil {
+				return fmt.Errorf("error creating machine: %s", err)
+			}
+			return nil
+		}
+		return fmt.Errorf("error get existing machine: %s", err)
+	}
+
+	if machine.Status.Converged {
+		w.log.Infof("Machine already converged: %s", machine.Name)
+		return nil
+	}
+
+	puppetTarget := machine.Spec.PuppetTargetRef
+	if puppetTarget == "" {
+		w.log.Warn("no puppet target for machine: ", machine.Name)
+		return nil
+	}
+
+	// FIXME: this shouldn't be done on the wing agent
+	jobName := fmt.Sprintf("%s-%s", w.flags.InstanceName, puppetTarget)
+	jobsAPI := w.clientset.WingV1alpha1().WingJobs(w.flags.ClusterName)
+	job, err := jobsAPI.Get(
+		jobName,
+		metav1.GetOptions{},
+	)
+	if err != nil {
+		if kerr, ok := err.(*apierrors.StatusError); ok && kerr.ErrStatus.Reason == metav1.StatusReasonNotFound {
+			job = &v1alpha1.WingJob{
+				ObjectMeta: metav1.ObjectMeta{
+					Name: jobName,
+				},
+				Spec: &v1alpha1.WingJobSpec{
+					InstanceName:     machine.Name,
+					PuppetTargetRef:  puppetTarget,
+					Operation:        "apply",
+					RequestTimestamp: metav1.Now(),
+				},
+				Status: &v1alpha1.WingJobStatus{},
+			}
+			_, err := jobsAPI.Create(job)
+			if err != nil {
+				return fmt.Errorf("error creating WingJob: %s", err)
+			}
+			return nil
+		}
+		return fmt.Errorf("error get existing WingJob: %s", err)
+	}
+
+	machineCopy := machine.DeepCopy()
+	machineCopy.Status.Converged = true
+	_, err = machineAPI.Update(machineCopy)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
diff --git a/pkg/wing/instancecontroller.go b/pkg/wing/instancecontroller.go
@@ -51,10 +51,6 @@ func (c *MachineController) processNextItem() bool {
 }
 
 func (c *MachineController) syncMachine(key string) error {
-
-	// ensure only one converge at a time
-	c.wing.convergeWG.Wait()
-
 	obj, exists, err := c.indexer.GetByKey(key)
 	if err != nil {
 		c.log.Errorf("Fetching object with key %s from store failed with %v", key, err)

diff --git a/pkg/wing/puppet.go b/pkg/wing/puppet.go
@@ -19,7 +19,6 @@ import (
 	"github.com/cenkalti/backoff"
 	"github.com/docker/docker/pkg/archive"
 	"golang.org/x/net/context"
-	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	"github.com/jetstack/tarmak/pkg/apis/wing/v1alpha1"
@@ -143,82 +142,6 @@ func (w *Wing) runPuppet(job *v1alpha1.WingJob) error {
 	return nil
 }
 
-func (w *Wing) convergeMachine() error {
-	machineAPI := w.clientset.WingV1alpha1().Machines(w.flags.ClusterName)
-	machine, err := machineAPI.Get(
-		w.flags.InstanceName,
-		metav1.GetOptions{},
-	)
-	if err != nil {
-		if kerr, ok := err.(*apierrors.StatusError); ok && kerr.ErrStatus.Reason == metav1.StatusReasonNotFound {
-			machine = &v1alpha1.Machine{
-				ObjectMeta: metav1.ObjectMeta{
-					Name: w.flags.InstanceName,
-				},
-				Status: v1alpha1.MachineStatus{
-					Converged: false,
-				},
-			}
-			_, err := machineAPI.Create(machine)
-			if err != nil {
-				return fmt.Errorf("error creating machine: %s", err)
-			}
-			return nil
-		}
-		return fmt.Errorf("error get existing machine: %s", err)
-	}
-
-	if machine.Status.Converged {
-		w.log.Infof("Machine already converged: ", machine.Name)
-		return nil
-	}
-
-	puppetTarget := machine.Spec.PuppetTargetRef
-	if puppetTarget == "" {
-		w.log.Warn("no puppet target for machine: ", machine.Name)
-		return nil
-	}
-
-	// FIXME: this shouldn't be done on the wing agent
-	jobName := fmt.Sprintf("%s-%s", w.flags.InstanceName, puppetTarget)
-	jobsAPI := w.clientset.WingV1alpha1().WingJobs(w.flags.ClusterName)
-	job, err := jobsAPI.Get(
-		jobName,
-		metav1.GetOptions{},
-	)
-	if err != nil {
-		if kerr, ok := err.(*apierrors.StatusError); ok && kerr.ErrStatus.Reason == metav1.StatusReasonNotFound {
-			job = &v1alpha1.WingJob{
-				ObjectMeta: metav1.ObjectMeta{
-					Name: jobName,
-				},
-				Spec: &v1alpha1.WingJobSpec{
-					InstanceName:     machine.Name,
-					PuppetTargetRef:  puppetTarget,
-					Operation:        "apply",
-					RequestTimestamp: metav1.Now(),
-				},
-				Status: &v1alpha1.WingJobStatus{},
-			}
-			_, err := jobsAPI.Create(job)
-			if err != nil {
-				return fmt.Errorf("error creating WingJob: %s", err)
-			}
-			return nil
-		}
-		return fmt.Errorf("error get existing WingJob: %s", err)
-	}
-
-	machineCopy := machine.DeepCopy()
-	machineCopy.Status.Converged = true
-	_, err = machineAPI.Update(machineCopy)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
 func (w *Wing) converge(job *v1alpha1.WingJob) {
 	w.convergeWG.Add(1)
 	defer w.convergeWG.Done()

diff --git a/pkg/wing/wing.go b/pkg/wing/wing.go
@@ -88,9 +88,6 @@ func (w *Wing) Run(args []string) error {
 	signal.Notify(signalCh, syscall.SIGTERM, syscall.SIGINT, syscall.SIGHUP)
 	w.signalHandler(signalCh)
 
-	// run converge on instance after first start
-	go w.convergeMachine()
-
 	// start watching for API server events that trigger applies
 	w.watchForNotifications()