@@ -21,17 +21,17 @@ public class EventDispatcher {
21
21
private final static Logger log = LoggerFactory .getLogger (EventDispatcher .class );
22
22
23
23
private final ResourceController controller ;
24
- private final String resourceDefaultFinalizer ;
24
+ private final String resourceFinalizer ;
25
25
private final CustomResourceFacade customResourceFacade ;
26
26
private final boolean generationAware ;
27
27
private final Map <String , Long > lastGenerationProcessedSuccessfully = new ConcurrentHashMap <>();
28
28
29
29
public EventDispatcher (ResourceController controller ,
30
- String defaultFinalizer ,
30
+ String finalizer ,
31
31
CustomResourceFacade customResourceFacade , boolean generationAware ) {
32
32
this .controller = controller ;
33
33
this .customResourceFacade = customResourceFacade ;
34
- this .resourceDefaultFinalizer = defaultFinalizer ;
34
+ this .resourceFinalizer = finalizer ;
35
35
this .generationAware = generationAware ;
36
36
}
37
37
@@ -43,23 +43,23 @@ public void handleEvent(CustomResourceEvent event) {
43
43
log .error ("Received error for resource: {}" , resource .getMetadata ().getName ());
44
44
return ;
45
45
}
46
- if (markedForDeletion (resource ) && !ControllerUtils .hasDefaultFinalizer (resource , resourceDefaultFinalizer )) {
47
- log .debug ("Skipping event dispatching since its marked for deletion but has no default finalizer: {}" , event );
46
+ if (markedForDeletion (resource ) && !ControllerUtils .hasGivenFinalizer (resource , resourceFinalizer )) {
47
+ log .debug ("Skipping event dispatching since its marked for deletion but does not have finalizer: {}" , event );
48
48
return ;
49
49
}
50
50
Context context = new DefaultContext (new RetryInfo (event .getRetryCount (), event .getRetryExecution ().isLastExecution ()));
51
51
if (markedForDeletion (resource )) {
52
52
boolean removeFinalizer = controller .deleteResource (resource , context );
53
- boolean hasDefaultFinalizer = ControllerUtils .hasDefaultFinalizer (resource , resourceDefaultFinalizer );
54
- if (removeFinalizer && hasDefaultFinalizer ) {
55
- removeDefaultFinalizer (resource );
53
+ boolean hasFinalizer = ControllerUtils .hasGivenFinalizer (resource , resourceFinalizer );
54
+ if (removeFinalizer && hasFinalizer ) {
55
+ removeFinalizer (resource );
56
56
} else {
57
- log .debug ("Skipping finalizer remove. removeFinalizer: {}, hasDefaultFinalizer : {} " ,
58
- removeFinalizer , hasDefaultFinalizer );
57
+ log .debug ("Skipping finalizer remove. removeFinalizer: {}, hasFinalizer : {} " ,
58
+ removeFinalizer , hasFinalizer );
59
59
}
60
60
cleanup (resource );
61
61
} else {
62
- if (!ControllerUtils .hasDefaultFinalizer (resource , resourceDefaultFinalizer ) && !markedForDeletion (resource )) {
62
+ if (!ControllerUtils .hasGivenFinalizer (resource , resourceFinalizer ) && !markedForDeletion (resource )) {
63
63
/* We always add the default finalizer if missing and not marked for deletion.
64
64
We execute the controller processing only for processing the event sent as a results
65
65
of the finalizer add. This will make sure that the resources are not created before
@@ -118,9 +118,9 @@ private void updateCustomResource(CustomResource updatedResource) {
118
118
}
119
119
120
120
121
- private void removeDefaultFinalizer (CustomResource resource ) {
121
+ private void removeFinalizer (CustomResource resource ) {
122
122
log .debug ("Removing finalizer on resource {}:" , resource );
123
- resource .getMetadata ().getFinalizers ().remove (resourceDefaultFinalizer );
123
+ resource .getMetadata ().getFinalizers ().remove (resourceFinalizer );
124
124
customResourceFacade .replaceWithLock (resource );
125
125
}
126
126
@@ -130,12 +130,12 @@ private void replace(CustomResource resource) {
130
130
}
131
131
132
132
private void addFinalizerIfNotPresent (CustomResource resource ) {
133
- if (!ControllerUtils .hasDefaultFinalizer (resource , resourceDefaultFinalizer ) && !markedForDeletion (resource )) {
133
+ if (!ControllerUtils .hasGivenFinalizer (resource , resourceFinalizer ) && !markedForDeletion (resource )) {
134
134
log .info ("Adding default finalizer to {}" , resource .getMetadata ());
135
135
if (resource .getMetadata ().getFinalizers () == null ) {
136
136
resource .getMetadata ().setFinalizers (new ArrayList <>(1 ));
137
137
}
138
- resource .getMetadata ().getFinalizers ().add (resourceDefaultFinalizer );
138
+ resource .getMetadata ().getFinalizers ().add (resourceFinalizer );
139
139
}
140
140
}
141
141
0 commit comments