Skip to content

Commit 939461d

Browse files
author
Shawn Hurley
committed
pkg/ansible: Adding unit tests for the ansible operator reconcile loop
1 parent c627d62 commit 939461d

File tree

5 files changed

+551
-4
lines changed

5 files changed

+551
-4
lines changed

Gopkg.lock

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/ansible/controller/reconcile.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ func (r *AnsibleOperatorReconciler) Reconcile(request reconcile.Request) (reconc
8989
}
9090
if !contains(pendingFinalizers, finalizer) && deleted {
9191
logrus.Info("Resource is terminated, skipping reconcilation")
92-
return reconcileResult, nil
92+
return reconcile.Result{}, nil
9393
}
9494

9595
spec := u.Object["spec"]
@@ -122,7 +122,7 @@ func (r *AnsibleOperatorReconciler) Reconcile(request reconcile.Request) (reconc
122122
ansiblestatus.RunningMessage,
123123
)
124124
ansiblestatus.SetCondition(&crStatus, *c)
125-
u.Object["status"] = crStatus
125+
u.Object["status"] = crStatus.GetJSONMap()
126126
err = r.Client.Update(context.TODO(), u)
127127
if err != nil {
128128
return reconcileResult, err
@@ -217,7 +217,7 @@ func (r *AnsibleOperatorReconciler) Reconcile(request reconcile.Request) (reconc
217217
ansiblestatus.SetCondition(&crStatus, *c)
218218
}
219219
// This needs the status subresource to be enabled by default.
220-
u.Object["status"] = crStatus
220+
u.Object["status"] = crStatus.GetJSONMap()
221221
err = r.Client.Update(context.TODO(), u)
222222
return reconcileResult, err
223223

0 commit comments

Comments
 (0)