Skip to content

Commit 4aa349e

Browse files
authored
small fixes and improvements (#171)
Signed-off-by: Attila Mészáros <a_meszaros@apple.com>
1 parent 6bc6896 commit 4aa349e

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

src/main/java/io/javaoperatorsdk/operator/glue/reconciler/glue/GlueReconciler.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ private boolean deletedGlueIfParentMarkedForDeletion(Context<Glue> context, Glue
140140
private UpdateControl<Glue> removeErrorMessageFromGlueStatusIfPresent(Glue primary) {
141141
if (primary.getStatus() != null && primary.getStatus().getErrorMessage() != null) {
142142
primary.getStatus().setErrorMessage(null);
143+
primary.getMetadata().setResourceVersion(null);
143144
return UpdateControl.patchStatus(primary);
144145
} else {
145146
return UpdateControl.noUpdate();
@@ -274,8 +275,10 @@ private void patchRelatedResourcesStatus(Context<Glue> context,
274275
genericTemplateHandler.processTemplate(actualData, template, objectTemplate);
275276
var statusObjectMap = GenericTemplateHandler.parseTemplateToMapObject(resultTemplate);
276277
relatedResources.forEach((n, kr) -> {
277-
kr.setAdditionalProperty("status", statusObjectMap);
278-
context.getClient().resource(kr).patchStatus();
278+
if (kr != null) {
279+
kr.setAdditionalProperty("status", statusObjectMap);
280+
context.getClient().resource(kr).patchStatus();
281+
}
279282
});
280283
});
281284

0 commit comments

Comments
 (0)