pkg/ansible: Add Phase to CR status field for Ansible Operator (#543)

* Add Phase to CR status field for Ansible Operator

Author: dymurray

pkg/ansible/controller/reconcile.go

@@ -70,14 +70,42 @@ func (r *AnsibleOperatorReconciler) Reconcile(request reconcile.Request) (reconc
 		return reconcile.Result{}, nil
 	}
 
-	s := u.Object["spec"]
-	_, ok := s.(map[string]interface{})
+	spec := u.Object["spec"]
+	_, ok := spec.(map[string]interface{})
 	if !ok {
-		logrus.Warnf("spec was not found")
+		logrus.Debugf("spec was not found")
 		u.Object["spec"] = map[string]interface{}{}
-		r.Client.Update(context.TODO(), u)
+		err = r.Client.Update(context.TODO(), u)
+		if err != nil {
+			return reconcile.Result{}, err
+		}
+		return reconcile.Result{Requeue: true}, nil
+	}
+	status := u.Object["status"]
+	_, ok = status.(map[string]interface{})
+	if !ok {
+		logrus.Debugf("status was not found")
+		u.Object["status"] = map[string]interface{}{}
+		err = r.Client.Update(context.TODO(), u)
+		if err != nil {
+			return reconcile.Result{}, err
+		}
 		return reconcile.Result{Requeue: true}, nil
 	}
+
+	// If status is an empty map we can assume CR was just created
+	if len(u.Object["status"].(map[string]interface{})) == 0 {
+		logrus.Debugf("Setting phase status to %v", StatusPhaseCreating)
+		u.Object["status"] = ResourceStatus{
+			Phase: StatusPhaseCreating,
+		}
+		err = r.Client.Update(context.TODO(), u)
+		if err != nil {
+			return reconcile.Result{}, err
+		}
+		return reconcile.Result{Requeue: true}, nil
+	}
+
 	ownerRef := metav1.OwnerReference{
 		APIVersion: u.GetAPIVersion(),
 		Kind:       u.GetKind(),

pkg/ansible/controller/types.go

@@ -19,7 +19,10 @@ import (
 )
 
 const (
-	host = "localhost"
+	host                = "localhost"
+	StatusPhaseCreating = "Creating"
+	StatusPhaseRunning  = "Running"
+	StatusPhaseFailed   = "Failed"
 )
 
 type Status struct {
@@ -96,13 +99,15 @@ func NewStatusFromMap(sm map[string]interface{}) Status {
 
 type ResourceStatus struct {
 	Status         `json:",inline"`
+	Phase          string   `json:"phase"`
 	FailureMessage string   `json:"reason,omitempty"`
 	History        []Status `json:"history,omitempty"`
 }
 
 func UpdateResourceStatus(sm map[string]interface{}, je eventapi.StatusJobEvent) (bool, ResourceStatus) {
 	newStatus := NewStatusFromStatusJobEvent(je)
 	oldStatus := NewStatusFromMap(sm)
+	phase := StatusPhaseRunning
 	// Don't update the status if new status and old status are equal.
 	if IsStatusEqual(newStatus, oldStatus) {
 		return false, ResourceStatus{}
@@ -117,9 +122,15 @@ func UpdateResourceStatus(sm map[string]interface{}, je eventapi.StatusJobEvent)
 			history = append(history, NewStatusFromMap(ma))
 		}
 	}
+
+	if newStatus.Failures > 0 {
+		phase = StatusPhaseFailed
+	}
+
 	history = append(history, oldStatus)
 	return true, ResourceStatus{
 		Status:  newStatus,
+		Phase:   phase,
 		History: history,
 	}
 }