changelog

operator-framework · Jan 9, 2020 · 5142e28 · 5142e28
1 parent 4b8e84f
commit 5142e28
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 20 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -29,6 +29,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
 

diff --git a/pkg/ansible/controller/reconcile.go b/pkg/ansible/controller/reconcile.go
@@ -182,7 +182,7 @@ func (r *AnsibleOperatorReconciler) Reconcile(request reconcile.Request) (reconc
 			}
 		}
 		if event.Event == eventapi.EventRunnerOnFailed && !event.IgnoreError() {
-			eventErr := errors.New("event runner on failed : " + event.GetFailedPlaybookMessage())
+			eventErr := errors.New("event runner on failed")
 			return reconcile.Result{}, eventErr
 		}
 	}

diff --git a/pkg/ansible/controller/reconcile_test.go b/pkg/ansible/controller/reconcile_test.go
@@ -133,7 +133,7 @@ func TestReconcile(t *testing.T) {
 			},
 		},
 		{
-			Name:            "Failure message reconcile",
+			Name:            "Failure event runner on failed",
 			GVK:             gvk,
 			ReconcilePeriod: 5 * time.Second,
 			ManageStatus:    true,
@@ -165,15 +165,13 @@ func TestReconcile(t *testing.T) {
 					"spec":       map[string]interface{}{},
 				},
 			}),
-			Result: reconcile.Result{
-				RequeueAfter: 5 * time.Second,
-			},
 			Request: reconcile.Request{
 				NamespacedName: types.NamespacedName{
 					Name:      "reconcile",
 					Namespace: "default",
 				},
 			},
+			// Since face an event error needs re-trigger the reconcile
 			ExpectedObject: &unstructured.Unstructured{
 				Object: map[string]interface{}{
 					"metadata": map[string]interface{}{
@@ -183,23 +181,10 @@ func TestReconcile(t *testing.T) {
 					"apiVersion": "operator-sdk/v1beta1",
 					"kind":       "Testing",
 					"spec":       map[string]interface{}{},
-					"status": map[string]interface{}{
+					"status":     map[string]interface{}{
 						"conditions": []interface{}{
 							map[string]interface{}{
-								"status": "True",
-								"type":   "Failure",
-								"ansibleResult": map[string]interface{}{
-									"changed":    int64(0),
-									"failures":   int64(0),
-									"ok":         int64(0),
-									"skipped":    int64(0),
-									"completion": eventTime.Format("2006-01-02T15:04:05.99999999"),
-								},
-								"message": "new failure message",
-								"reason":  "Failed",
-							},
-							map[string]interface{}{
-								"status":  "False",
+								"status":  "True",
 								"type":    "Running",
 								"message": "Running reconciliation",
 								"reason":  "Running",
@@ -208,6 +193,7 @@ func TestReconcile(t *testing.T) {
 					},
 				},
 			},
+			ShouldError: true,
 		},
 		{
 			Name:            "Finalizer successful reconcile",