@@ -30,7 +30,7 @@ import (
30
30
"github.com/operator-framework/operator-sdk/pkg/ansible/runner"
31
31
"github.com/operator-framework/operator-sdk/pkg/ansible/runner/eventapi"
32
32
33
- "k8s.io/api/core/v1"
33
+ v1 "k8s.io/api/core/v1"
34
34
apierrors "k8s.io/apimachinery/pkg/api/errors"
35
35
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
36
36
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
@@ -191,7 +191,6 @@ func (r *AnsibleOperatorReconciler) Reconcile(request reconcile.Request) (reconc
191
191
if err != nil {
192
192
return reconcileResult , err
193
193
}
194
- return reconcileResult , nil
195
194
}
196
195
if r .ManageStatus {
197
196
err = r .markDone (u , request .NamespacedName , statusEvent , failureMessages )
@@ -214,25 +213,26 @@ func (r *AnsibleOperatorReconciler) markRunning(u *unstructured.Unstructured, na
214
213
215
214
// If there is no current status add that we are working on this resource.
216
215
errCond := ansiblestatus .GetCondition (crStatus , ansiblestatus .FailureConditionType )
217
- succCond := ansiblestatus .GetCondition (crStatus , ansiblestatus .RunningConditionType )
218
216
217
+ if errCond != nil {
218
+ errCond .Status = v1 .ConditionFalse
219
+ ansiblestatus .SetCondition (& crStatus , * errCond )
220
+ }
219
221
// If the condition is currently running, making sure that the values are correct.
220
222
// If they are the same a no-op, if they are different then it is a good thing we
221
223
// are updating it.
222
- if (errCond == nil && succCond == nil ) || (succCond != nil && succCond .Reason != ansiblestatus .SuccessfulReason ) {
223
- c := ansiblestatus .NewCondition (
224
- ansiblestatus .RunningConditionType ,
225
- v1 .ConditionTrue ,
226
- nil ,
227
- ansiblestatus .RunningReason ,
228
- ansiblestatus .RunningMessage ,
229
- )
230
- ansiblestatus .SetCondition (& crStatus , * c )
231
- u .Object ["status" ] = crStatus .GetJSONMap ()
232
- err := r .Client .Status ().Update (context .TODO (), u )
233
- if err != nil {
234
- return err
235
- }
224
+ c := ansiblestatus .NewCondition (
225
+ ansiblestatus .RunningConditionType ,
226
+ v1 .ConditionTrue ,
227
+ nil ,
228
+ ansiblestatus .RunningReason ,
229
+ ansiblestatus .RunningMessage ,
230
+ )
231
+ ansiblestatus .SetCondition (& crStatus , * c )
232
+ u .Object ["status" ] = crStatus .GetJSONMap ()
233
+ err = r .Client .Status ().Update (context .TODO (), u )
234
+ if err != nil {
235
+ return err
236
236
}
237
237
return nil
238
238
}
0 commit comments