@@ -99,8 +99,8 @@ func (r *AnsibleOperatorReconciler) Reconcile(request reconcile.Request) (reconc
99
99
}
100
100
}
101
101
if ! contains (pendingFinalizers , finalizer ) && deleted {
102
- logger .Info ("Resource is terminated, skipping reconcilation" )
103
- return reconcileResult , nil
102
+ logrus .Info ("Resource is terminated, skipping reconcilation" )
103
+ return reconcile. Result {} , nil
104
104
}
105
105
106
106
spec := u .Object ["spec" ]
@@ -133,7 +133,7 @@ func (r *AnsibleOperatorReconciler) Reconcile(request reconcile.Request) (reconc
133
133
ansiblestatus .RunningMessage ,
134
134
)
135
135
ansiblestatus .SetCondition (& crStatus , * c )
136
- u .Object ["status" ] = crStatus
136
+ u .Object ["status" ] = crStatus . GetJSONMap ()
137
137
err = r .Client .Update (context .TODO (), u )
138
138
if err != nil {
139
139
return reconcileResult , err
@@ -160,7 +160,7 @@ func (r *AnsibleOperatorReconciler) Reconcile(request reconcile.Request) (reconc
160
160
// iterate events from ansible, looking for the final one
161
161
statusEvent := eventapi.StatusJobEvent {}
162
162
failureMessages := eventapi.FailureMessages {}
163
- for event := range result .Events {
163
+ for event := range result .Events () {
164
164
for _ , eHandler := range r .EventHandlers {
165
165
go eHandler .Handle (ident , u , event )
166
166
}
@@ -234,7 +234,7 @@ func (r *AnsibleOperatorReconciler) Reconcile(request reconcile.Request) (reconc
234
234
ansiblestatus .SetCondition (& crStatus , * c )
235
235
}
236
236
// This needs the status subresource to be enabled by default.
237
- u .Object ["status" ] = crStatus
237
+ u .Object ["status" ] = crStatus . GetJSONMap ()
238
238
err = r .Client .Update (context .TODO (), u )
239
239
return reconcileResult , err
240
240
0 commit comments