From 0d50b846f9e1961ef6da5b3476e742b8685bb3e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Attila=20M=C3=A9sz=C3=A1ros?= <a_meszaros@apple.com>
Date: Tue, 7 Jan 2025 19:06:49 +0100
Subject: [PATCH] small fixes and improvements
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Attila Mészáros <a_meszaros@apple.com>
---
 .../operator/glue/reconciler/glue/GlueReconciler.java      | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/io/javaoperatorsdk/operator/glue/reconciler/glue/GlueReconciler.java b/src/main/java/io/javaoperatorsdk/operator/glue/reconciler/glue/GlueReconciler.java
index 4521718..d3cb5c9 100644
--- a/src/main/java/io/javaoperatorsdk/operator/glue/reconciler/glue/GlueReconciler.java
+++ b/src/main/java/io/javaoperatorsdk/operator/glue/reconciler/glue/GlueReconciler.java
@@ -140,6 +140,7 @@ private boolean deletedGlueIfParentMarkedForDeletion(Context<Glue> context, Glue
   private UpdateControl<Glue> removeErrorMessageFromGlueStatusIfPresent(Glue primary) {
     if (primary.getStatus() != null && primary.getStatus().getErrorMessage() != null) {
       primary.getStatus().setErrorMessage(null);
+      primary.getMetadata().setResourceVersion(null);
       return UpdateControl.patchStatus(primary);
     } else {
       return UpdateControl.noUpdate();
@@ -274,8 +275,10 @@ private void patchRelatedResourcesStatus(Context<Glue> context,
           genericTemplateHandler.processTemplate(actualData, template, objectTemplate);
       var statusObjectMap = GenericTemplateHandler.parseTemplateToMapObject(resultTemplate);
       relatedResources.forEach((n, kr) -> {
-        kr.setAdditionalProperty("status", statusObjectMap);
-        context.getClient().resource(kr).patchStatus();
+        if (kr != null) {
+          kr.setAdditionalProperty("status", statusObjectMap);
+          context.getClient().resource(kr).patchStatus();
+        }
       });
     });