web page sample update

Signed-off-by: Attila Mészáros <[email protected]>

Author: csviri

Diff for: sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/Utils.java

@@ -1,5 +1,6 @@
 package io.javaoperatorsdk.operator.sample;
 
+import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
 import io.fabric8.kubernetes.api.model.networking.v1.Ingress;
 import io.javaoperatorsdk.operator.api.reconciler.ErrorStatusUpdateControl;
 import io.javaoperatorsdk.operator.sample.customresource.WebPage;
@@ -11,6 +12,16 @@ public class Utils {
 
   private Utils() {}
 
+  public static WebPage createWebPageForStatusUpdate(WebPage webPage, String configMapName) {
+    WebPage res = new WebPage();
+    res.setMetadata(new ObjectMetaBuilder()
+        .withName(webPage.getMetadata().getName())
+        .withNamespace(webPage.getMetadata().getNamespace())
+        .build());
+    res.setStatus(createStatus(configMapName));
+    return res;
+  }
+
   public static WebPageStatus createStatus(String configMapName) {
     WebPageStatus status = new WebPageStatus();
     status.setHtmlConfigMap(configMapName);

Diff for: sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageDependentsWorkflowReconciler.java

@@ -61,10 +61,10 @@ public UpdateControl<WebPage> reconcile(WebPage webPage, Context<WebPage> contex
 
     workflow.reconcile(webPage, context);
 
-    webPage.setStatus(
-        createStatus(
-            context.getSecondaryResource(ConfigMap.class).orElseThrow().getMetadata().getName()));
-    return UpdateControl.patchStatus(webPage);
+    return UpdateControl
+        .patchStatus(
+            createWebPageForStatusUpdate(webPage, context.getSecondaryResource(ConfigMap.class)
+                .orElseThrow().getMetadata().getName()));
   }
 
   @Override

Diff for: sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageManagedDependentsReconciler.java

@@ -6,9 +6,7 @@
 import io.javaoperatorsdk.operator.sample.customresource.WebPage;
 import io.javaoperatorsdk.operator.sample.dependentresource.*;
 
-import static io.javaoperatorsdk.operator.sample.Utils.createStatus;
-import static io.javaoperatorsdk.operator.sample.Utils.handleError;
-import static io.javaoperatorsdk.operator.sample.Utils.simulateErrorIfRequested;
+import static io.javaoperatorsdk.operator.sample.Utils.*;
 
 /**
  * Shows how to implement a reconciler with managed dependent resources.
@@ -39,8 +37,7 @@ public UpdateControl<WebPage> reconcile(WebPage webPage, Context<WebPage> contex
 
     final var name = context.getSecondaryResource(ConfigMap.class).orElseThrow()
         .getMetadata().getName();
-    webPage.setStatus(createStatus(name));
-    return UpdateControl.patchStatus(webPage);
+    return UpdateControl.patchStatus(createWebPageForStatusUpdate(webPage, name));
   }
 
   @Override

Diff for: sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageReconciler.java

@@ -132,8 +132,9 @@ public UpdateControl<WebPage> reconcile(WebPage webPage, Context<WebPage> contex
       log.info("Restarting pods because HTML has changed in {}", ns);
       kubernetesClient.pods().inNamespace(ns).withLabel("app", deploymentName(webPage)).delete();
     }
-    webPage.setStatus(createStatus(desiredHtmlConfigMap.getMetadata().getName()));
-    return UpdateControl.patchStatus(webPage);
+
+    return UpdateControl.patchStatus(
+        createWebPageForStatusUpdate(webPage, desiredHtmlConfigMap.getMetadata().getName()));
   }
 
   private boolean match(Ingress desiredIngress, Ingress existingIngress) {