wip

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

Author: csviri

src/main/java/io/javaoperatorsdk/operator/glue/customresource/operator/GlueOperatorSpec.java

@@ -12,7 +12,6 @@ public class GlueOperatorSpec extends GlueSpec {
 
   private GlueMetadata glueMetadata;
 
-
   public Parent getParent() {
     return parent;
   }

src/main/java/io/javaoperatorsdk/operator/glue/customresource/operator/Parent.java

@@ -2,13 +2,18 @@
 
 import java.util.Objects;
 
+import io.fabric8.crd.generator.annotation.PreserveUnknownFields;
+
 public class Parent {
 
   private String apiVersion;
   private String kind;
   private boolean clusterScoped = false;
   private String labelSelector;
 
+  @PreserveUnknownFields
+  private Object status;
+  private String statusTemplate;
 
   public Parent() {}
 
@@ -51,6 +56,22 @@ public void setClusterScoped(boolean clusterScoped) {
     this.clusterScoped = clusterScoped;
   }
 
+  public Object getStatus() {
+    return status;
+  }
+
+  public void setStatus(Object status) {
+    this.status = status;
+  }
+
+  public String getStatusTemplate() {
+    return statusTemplate;
+  }
+
+  public void setStatusTemplate(String statusTemplate) {
+    this.statusTemplate = statusTemplate;
+  }
+
   @Override
   public boolean equals(Object o) {
     if (this == o)
@@ -59,11 +80,13 @@ public boolean equals(Object o) {
       return false;
     Parent parent = (Parent) o;
     return clusterScoped == parent.clusterScoped && Objects.equals(apiVersion, parent.apiVersion)
-        && Objects.equals(kind, parent.kind) && Objects.equals(labelSelector, parent.labelSelector);
+        && Objects.equals(kind, parent.kind) && Objects.equals(labelSelector, parent.labelSelector)
+        && Objects.equals(status, parent.status)
+        && Objects.equals(statusTemplate, parent.statusTemplate);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(apiVersion, kind, clusterScoped, labelSelector);
+    return Objects.hash(apiVersion, kind, clusterScoped, labelSelector, status, statusTemplate);
   }
 }

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

@@ -19,6 +19,7 @@
 import io.javaoperatorsdk.operator.glue.customresource.glue.RelatedResourceSpec;
 import io.javaoperatorsdk.operator.glue.customresource.operator.GlueOperator;
 import io.javaoperatorsdk.operator.glue.customresource.operator.GlueOperatorSpec;
+import io.javaoperatorsdk.operator.glue.customresource.operator.Parent;
 import io.javaoperatorsdk.operator.glue.customresource.operator.ResourceFlowOperatorStatus;
 import io.javaoperatorsdk.operator.glue.reconciler.ValidationAndErrorHandler;
 import io.javaoperatorsdk.operator.glue.reconciler.glue.GlueReconciler;
@@ -103,7 +104,6 @@ private Glue createGlue(GenericKubernetesResource targetParentResource,
 
     ObjectMeta glueMetadata = glueMetadata(glueOperator, targetParentResource);
 
-
     glue.setMetadata(glueMetadata);
     glue.setSpec(toWorkflowSpec(glueOperator.getSpec()));
 
@@ -112,17 +112,27 @@ private Glue createGlue(GenericKubernetesResource targetParentResource,
     }
 
     var parent = glueOperator.getSpec().getParent();
+    RelatedResourceSpec parentRelatedSpec =
+        parentRelatedResourceSpec(targetParentResource, glueOperator, parent);
+
+    glue.getSpec().getRelatedResources().add(parentRelatedSpec);
+    glue.addOwnerReference(targetParentResource);
+    return glue;
+  }
+
+  private static RelatedResourceSpec parentRelatedResourceSpec(
+      GenericKubernetesResource targetParentResource, GlueOperator glueOperator, Parent parent) {
     RelatedResourceSpec parentRelatedSpec = new RelatedResourceSpec();
     parentRelatedSpec.setName(PARENT_RELATED_RESOURCE_NAME);
     parentRelatedSpec.setApiVersion(parent.getApiVersion());
     parentRelatedSpec.setKind(parent.getKind());
     parentRelatedSpec.setResourceNames(List.of(targetParentResource.getMetadata().getName()));
     parentRelatedSpec.setNamespace(targetParentResource.getMetadata().getNamespace());
     parentRelatedSpec.setClusterScoped(glueOperator.getSpec().getParent().isClusterScoped());
-
-    glue.getSpec().getRelatedResources().add(parentRelatedSpec);
-    glue.addOwnerReference(targetParentResource);
-    return glue;
+    parentRelatedSpec
+        .setStatusPatchTemplate(glueOperator.getSpec().getParent().getStatusTemplate());
+    parentRelatedSpec.setStatusPatch(glueOperator.getSpec().getParent().getStatus());
+    return parentRelatedSpec;
   }
 
   private ObjectMeta glueMetadata(GlueOperator glueOperator,

src/test/java/io/javaoperatorsdk/operator/glue/sample/webpage/WebPageE2E.java

@@ -62,6 +62,7 @@ void testWebPageCRUDOperations() {
     client.resource(createdWebPage).delete();
 
     await().timeout(TestUtils.GC_WAIT_TIMEOUT).untilAsserted(() -> {
+      var wp = client.resources(WebPage.class).withName("webpage1").get();
       var deployment =
           client.resources(Deployment.class).withName(webPage.getMetadata().getName()).get();
       var configMap =
@@ -73,6 +74,7 @@ void testWebPageCRUDOperations() {
       assertThat(configMap).isNull();
       assertThat(service).isNull();
       assertThat(ingress).isNull();
+      assertThat(wp.getStatus().getObservedGeneration()).isNotNull();
     });
   }
 

src/test/java/io/javaoperatorsdk/operator/glue/sample/webpage/WebPageStatus.java

@@ -1,11 +1,15 @@
 package io.javaoperatorsdk.operator.glue.sample.webpage;
 
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 
-@JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({})
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
 public class WebPageStatus {
+
+  private Long observedGeneration;
+
+  public Long getObservedGeneration() {
+    return observedGeneration;
+  }
+
+  public void setObservedGeneration(Long observedGeneration) {
+    this.observedGeneration = observedGeneration;
+  }
 }

src/test/resources/sample/webpage/webpage.operator.yaml

@@ -6,6 +6,8 @@ spec:
   parent:
     apiVersion: glueoperator.sample/v1
     kind: WebPage
+    status:
+      observedGeneration: "{parent.metadata.generation}"
   childResources:
     - name: htmlconfigmap
       resource: