fix: (ansible) - Errors in the event have not been re-trigging the reconcile. (#2375)

* fix: (ansible) -Errors in the event have not been re-trigging the reconcile
* Add a new test to check it with ManageStatus == false as well
* Add changelog
Closes #2372

Author: camilamacedo86

CHANGELOG.md

@@ -39,6 +39,7 @@
 
 - Fix `operator-sdk build`'s `--image-build-args` to support spaces within quotes like `--label some.name="First Last"`. ([#2312](https://github.com/operator-framework/operator-sdk/pull/2312))
 - Fix misleading Helm operator "release not found" errors during CR deletion. ([#2359](https://github.com/operator-framework/operator-sdk/pull/2359))
+- Fix Ansible based image in order to re-trigger reconcile when playbooks are runner with error. ([#2375](https://github.com/operator-framework/operator-sdk/pull/2375))
 
 ## v0.13.0
 

pkg/ansible/controller/reconcile.go

@@ -213,6 +213,7 @@ func (r *AnsibleOperatorReconciler) Reconcile(request reconcile.Request) (reconc
 	// We only want to update the CustomResource once, so we'll track changes
 	// and do it at the end
 	runSuccessful := len(failureMessages) == 0
+
 	// The finalizer has run successfully, time to remove it
 	if deleted && finalizerExists && runSuccessful {
 		finalizers := []string{}
@@ -233,8 +234,17 @@ func (r *AnsibleOperatorReconciler) Reconcile(request reconcile.Request) (reconc
 		if errmark != nil {
 			logger.Error(errmark, "Failed to mark status done")
 		}
+		// re-trigger reconcile because of failures
+		if !runSuccessful {
+			return reconcileResult, errors.New("event runner on failed")
+		}
 		return reconcileResult, errmark
 	}
+
+	// re-trigger reconcile because of failures
+	if !runSuccessful {
+		return reconcileResult, errors.New("received failed task event")
+	}
 	return reconcileResult, nil
 }
 

pkg/ansible/controller/reconcile_test.go

@@ -133,10 +133,9 @@ func TestReconcile(t *testing.T) {
 			},
 		},
 		{
-			Name:            "Failure message reconcile",
-			GVK:             gvk,
-			ReconcilePeriod: 5 * time.Second,
-			ManageStatus:    true,
+			Name:         "Failure event runner on failed with manageStatus == true",
+			GVK:          gvk,
+			ManageStatus: true,
 			Runner: &fake.Runner{
 				JobEvents: []eventapi.JobEvent{
 					eventapi.JobEvent{
@@ -165,9 +164,6 @@ func TestReconcile(t *testing.T) {
 					"spec":       map[string]interface{}{},
 				},
 			}),
-			Result: reconcile.Result{
-				RequeueAfter: 5 * time.Second,
-			},
 			Request: reconcile.Request{
 				NamespacedName: types.NamespacedName{
 					Name:      "reconcile",
@@ -185,6 +181,12 @@ func TestReconcile(t *testing.T) {
 					"spec":       map[string]interface{}{},
 					"status": map[string]interface{}{
 						"conditions": []interface{}{
+							map[string]interface{}{
+								"status":  "False",
+								"type":    "Running",
+								"message": "Running reconciliation",
+								"reason":  "Running",
+							},
 							map[string]interface{}{
 								"status": "True",
 								"type":   "Failure",
@@ -198,16 +200,51 @@ func TestReconcile(t *testing.T) {
 								"message": "new failure message",
 								"reason":  "Failed",
 							},
-							map[string]interface{}{
-								"status":  "False",
-								"type":    "Running",
-								"message": "Running reconciliation",
-								"reason":  "Running",
+						},
+					},
+				},
+			},
+			ShouldError: true,
+		},
+		{
+			Name:         "Failure event runner on failed",
+			GVK:          gvk,
+			ManageStatus: false,
+			Runner: &fake.Runner{
+				JobEvents: []eventapi.JobEvent{
+					eventapi.JobEvent{
+						Event:   eventapi.EventRunnerOnFailed,
+						Created: eventapi.EventTime{Time: eventTime},
+						EventData: map[string]interface{}{
+							"res": map[string]interface{}{
+								"msg": "new failure message",
 							},
 						},
 					},
+					eventapi.JobEvent{
+						Event:   eventapi.EventPlaybookOnStats,
+						Created: eventapi.EventTime{Time: eventTime},
+					},
 				},
 			},
+			Client: fakeclient.NewFakeClient(&unstructured.Unstructured{
+				Object: map[string]interface{}{
+					"metadata": map[string]interface{}{
+						"name":      "reconcile",
+						"namespace": "default",
+					},
+					"apiVersion": "operator-sdk/v1beta1",
+					"kind":       "Testing",
+					"spec":       map[string]interface{}{},
+				},
+			}),
+			Request: reconcile.Request{
+				NamespacedName: types.NamespacedName{
+					Name:      "reconcile",
+					Namespace: "default",
+				},
+			},
+			ShouldError: true,
 		},
 		{
 			Name:            "Finalizer successful reconcile",