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