@@ -182,7 +182,7 @@ void eventProcessingFinished(
182
182
if (!running ) {
183
183
return ;
184
184
}
185
- ResourceID resourceID = executionScope .getCustomResourceID ();
185
+ ResourceID resourceID = executionScope .getResourceID ();
186
186
log .debug (
187
187
"Event processing finished. Scope: {}, PostExecutionControl: {}" ,
188
188
executionScope ,
@@ -202,7 +202,7 @@ void eventProcessingFinished(
202
202
cleanupOnSuccessfulExecution (executionScope );
203
203
metrics .finishedReconciliation (resourceID );
204
204
if (eventMarker .deleteEventPresent (resourceID )) {
205
- cleanupForDeletedEvent (executionScope .getCustomResourceID ());
205
+ cleanupForDeletedEvent (executionScope .getResourceID ());
206
206
} else {
207
207
postExecutionControl .getUpdatedCustomResource ().ifPresent (
208
208
r -> eventSourceManager .getControllerResourceEventSource ().handleRecentResourceUpdate (
@@ -244,7 +244,7 @@ TimerEventSource<R> retryEventSource() {
244
244
private void handleRetryOnException (
245
245
ExecutionScope <R > executionScope , Exception exception ) {
246
246
RetryExecution execution = getOrInitRetryExecution (executionScope );
247
- var customResourceID = executionScope .getCustomResourceID ();
247
+ var customResourceID = executionScope .getResourceID ();
248
248
boolean eventPresent = eventMarker .eventPresent (customResourceID );
249
249
eventMarker .markEventReceived (customResourceID );
250
250
@@ -271,16 +271,16 @@ private void cleanupOnSuccessfulExecution(ExecutionScope<R> executionScope) {
271
271
log .debug (
272
272
"Cleanup for successful execution for resource: {}" , getName (executionScope .getResource ()));
273
273
if (isRetryConfigured ()) {
274
- retryState .remove (executionScope .getCustomResourceID ());
274
+ retryState .remove (executionScope .getResourceID ());
275
275
}
276
- retryEventSource ().cancelOnceSchedule (executionScope .getCustomResourceID ());
276
+ retryEventSource ().cancelOnceSchedule (executionScope .getResourceID ());
277
277
}
278
278
279
279
private RetryExecution getOrInitRetryExecution (ExecutionScope <R > executionScope ) {
280
- RetryExecution retryExecution = retryState .get (executionScope .getCustomResourceID ());
280
+ RetryExecution retryExecution = retryState .get (executionScope .getResourceID ());
281
281
if (retryExecution == null ) {
282
282
retryExecution = retry .initExecution ();
283
- retryState .put (executionScope .getCustomResourceID (), retryExecution );
283
+ retryState .put (executionScope .getResourceID (), retryExecution );
284
284
}
285
285
return retryExecution ;
286
286
}
0 commit comments