Skip to content

feature: ResourceID from first owner reference #841

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 17, 2022
Merged

feature: ResourceID from first owner reference #841

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cb87975
feature: ResourceID from first owner reference
csviri Jan 17, 2022
bd24950
fix: formatting
csviri Jan 17, 2022
f93cd14
fix: from code review
csviri Jan 17, 2022
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
9 changes: 9 additions & 0 deletions ...framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/ResourceID.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,15 @@ public static ResourceID fromResource(HasMetadata resource) {
resource.getMetadata().getNamespace());
}

public static Optional<ResourceID> fromFirstOwnerReference(HasMetadata dependentResource) {
Copy link
Collaborator

Choose a reason for hiding this comment

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

It'd be better if you'd use the implementation from the dependent resources branch: https://github.com/java-operator-sdk/java-operator-sdk/pull/785/files#diff-5166f926d491fa8bc37664176eb65ecb8dc051b8db0e3d3771fb817a1fbd462dR70-R80 so that merging later will be easier.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

good point, changed

var ownerReferences = dependentResource.getMetadata().getOwnerReferences();
if (ownerReferences == null || ownerReferences.isEmpty()) {
return Optional.empty();
}
return Optional.of(new ResourceID(ownerReferences.get(0).getName(),
dependentResource.getMetadata().getNamespace()));
}

private final String name;
private final String namespace;

Expand Down
11 changes: 2 additions & 9 deletions ...rs/tomcat-operator/src/main/java/io/javaoperatorsdk/operator/sample/TomcatReconciler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,8 @@ public List<EventSource> prepareEventSources(EventSourceContext<Tomcat> context)
.runnableInformer(0);

return List.of(new InformerEventSource<>(
deploymentInformer, d -> {
var ownerReferences = d.getMetadata().getOwnerReferences();
if (!ownerReferences.isEmpty()) {
return Set.of(new ResourceID(ownerReferences.get(0).getName(),
d.getMetadata().getNamespace()));
} else {
return EMPTY_SET;
}
}));
deploymentInformer,
d -> ResourceID.fromFirstOwnerReference(d).map(r -> Set.of(r)).orElse(EMPTY_SET)));
}

@Override
Expand Down