Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -474,7 +474,8 @@ default boolean previousAnnotationForDependentResourcesEventFiltering() {
*
* @return a Set of resource classes where the previous version annotation won't be used.
*/
default Set<Class<? extends HasMetadata>> previousAnnotationUsageBlocklist() {
default Set<Class<? extends HasMetadata>>
previousAnnotationForDependentResourcesEventFilteringBlocklist() {
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is fine to have also with shorter form and keep it consistent. (withPreviousAnnotationForDependentResourcesBlocklist)

return Set.of(Deployment.class, StatefulSet.class);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -189,9 +189,9 @@ public ConfigurationServiceOverrider withCloneSecondaryResourcesWhenGettingFromC
return this;
}

public ConfigurationServiceOverrider previousAnnotationUsageBlocklist(
Set<Class<? extends HasMetadata>> previousAnnotationUsageBlacklist) {
this.previousAnnotationUsageBlocklist = previousAnnotationUsageBlacklist;
public ConfigurationServiceOverrider withPreviousAnnotationForDependentResourcesBlocklist(
Set<Class<? extends HasMetadata>> blocklist) {
this.previousAnnotationUsageBlocklist = blocklist;
return this;
}

Expand Down Expand Up @@ -337,10 +337,11 @@ public boolean cloneSecondaryResourcesWhenGettingFromCache() {
}

@Override
public Set<Class<? extends HasMetadata>> previousAnnotationUsageBlocklist() {
public Set<Class<? extends HasMetadata>>
previousAnnotationForDependentResourcesEventFilteringBlocklist() {
return overriddenValueOrDefault(
previousAnnotationUsageBlocklist,
ConfigurationService::previousAnnotationUsageBlocklist);
ConfigurationService::previousAnnotationForDependentResourcesEventFilteringBlocklist);
}
};
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ private boolean usePreviousAnnotation(Context<P> context) {
&& !context
.getControllerConfiguration()
.getConfigurationService()
.previousAnnotationUsageBlocklist()
.previousAnnotationForDependentResourcesEventFilteringBlocklist()
.contains(this.resourceType());
}
return usePreviousAnnotationForEventFiltering;
Expand Down