fix: impl, test

Author: csviri

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/dependent/GarbageCollected.java

@@ -1,10 +1,11 @@
 package io.javaoperatorsdk.operator.api.reconciler.dependent;
 
+import io.fabric8.kubernetes.api.model.HasMetadata;
+
 /**
- * Marker interface, that can be added in additionally to a {@link Deleter} Dependent Resource. It
- * is used to model a situation when a resource is makes sure to delete during reconciliation, but
+ * Used to describe the situation when a resource is makes sure to delete during reconciliation, but
  * not during cleanup, since that is handled by the Kubernetes garbage collector. See also:
  * https://github.com/java-operator-sdk/java-operator-sdk/issues/1127
  */
-public interface GarbageCollected {
+public interface GarbageCollected<P extends HasMetadata> extends Deleter<P> {
 }

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/CRUDKubernetesDependentResource.java

@@ -1,7 +1,6 @@
 package io.javaoperatorsdk.operator.processing.dependent.kubernetes;
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
-import io.javaoperatorsdk.operator.api.reconciler.dependent.Deleter;
 import io.javaoperatorsdk.operator.api.reconciler.dependent.GarbageCollected;
 import io.javaoperatorsdk.operator.processing.dependent.Creator;
 import io.javaoperatorsdk.operator.processing.dependent.Updater;
@@ -15,7 +14,7 @@
 public abstract class CRUDKubernetesDependentResource<R extends HasMetadata, P extends HasMetadata>
     extends
     KubernetesDependentResource<R, P>
-    implements Creator<R, P>, Updater<R, P>, Deleter<P>, GarbageCollected {
+    implements Creator<R, P>, Updater<R, P>, GarbageCollected<P> {
 
   public CRUDKubernetesDependentResource(Class<R> resourceType) {
     super(resourceType);

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/KubernetesDependentResource.java

@@ -152,7 +152,7 @@ protected InformerEventSource<R, P> createEventSource(EventSourceContext<P> cont
   }
 
   protected boolean addOwnerReference() {
-    return creatable && deletable && garbageCollected;
+    return garbageCollected;
   }
 
   @Override

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/orderedmanageddependent/ConfigMapDependentResource2.java

@@ -7,16 +7,15 @@
 import io.fabric8.kubernetes.api.model.ObjectMeta;
 import io.javaoperatorsdk.operator.api.reconciler.Context;
 import io.javaoperatorsdk.operator.api.reconciler.dependent.ReconcileResult;
+import io.javaoperatorsdk.operator.processing.dependent.kubernetes.CRUDKubernetesDependentResource;
 import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependent;
 import io.javaoperatorsdk.operator.processing.event.ResourceID;
 import io.javaoperatorsdk.operator.processing.event.source.PrimaryToSecondaryMapper;
 
 @KubernetesDependent(labelSelector = "dependent = cm2")
 public class ConfigMapDependentResource2 extends
-    io.javaoperatorsdk.operator.processing.dependent.kubernetes.CRUDKubernetesDependentResource<ConfigMap, OrderedManagedDependentCustomResource>
-    implements PrimaryToSecondaryMapper<OrderedManagedDependentCustomResource>,
-    io.javaoperatorsdk.operator.processing.dependent.Creator<ConfigMap, OrderedManagedDependentCustomResource>,
-    io.javaoperatorsdk.operator.processing.dependent.Updater<ConfigMap, OrderedManagedDependentCustomResource> {
+    CRUDKubernetesDependentResource<ConfigMap, OrderedManagedDependentCustomResource>
+    implements PrimaryToSecondaryMapper<OrderedManagedDependentCustomResource> {
 
   public ConfigMapDependentResource2() {
     super(ConfigMap.class);

sample-operators/tomcat-operator/src/main/java/io/javaoperatorsdk/operator/sample/DeploymentDependentResource.java

@@ -5,14 +5,12 @@
 import io.fabric8.kubernetes.api.model.apps.DeploymentBuilder;
 import io.javaoperatorsdk.operator.ReconcilerUtils;
 import io.javaoperatorsdk.operator.api.reconciler.Context;
-import io.javaoperatorsdk.operator.processing.dependent.Creator;
-import io.javaoperatorsdk.operator.processing.dependent.Updater;
+import io.javaoperatorsdk.operator.processing.dependent.kubernetes.CRUDKubernetesDependentResource;
 import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependent;
-import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependentResource;
 
 @KubernetesDependent(labelSelector = "app.kubernetes.io/managed-by=tomcat-operator")
-public class DeploymentDependentResource extends KubernetesDependentResource<Deployment, Tomcat>
-    implements Creator<Deployment, Tomcat>, Updater<Deployment, Tomcat> {
+public class DeploymentDependentResource
+    extends CRUDKubernetesDependentResource<Deployment, Tomcat> {
 
   public DeploymentDependentResource() {
     super(Deployment.class);

sample-operators/tomcat-operator/src/main/java/io/javaoperatorsdk/operator/sample/ServiceDependentResource.java

@@ -5,12 +5,11 @@
 import io.fabric8.kubernetes.api.model.ServiceBuilder;
 import io.javaoperatorsdk.operator.ReconcilerUtils;
 import io.javaoperatorsdk.operator.api.reconciler.Context;
-import io.javaoperatorsdk.operator.processing.dependent.Creator;
-import io.javaoperatorsdk.operator.processing.dependent.Updater;
-import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependentResource;
+import io.javaoperatorsdk.operator.processing.dependent.kubernetes.CRUDKubernetesDependentResource;
+import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependent;
 
-public class ServiceDependentResource extends KubernetesDependentResource<Service, Tomcat>
-    implements Creator<Service, Tomcat>, Updater<Service, Tomcat> {
+@KubernetesDependent(labelSelector = "app.kubernetes.io/managed-by=tomcat-operator")
+public class ServiceDependentResource extends CRUDKubernetesDependentResource<Service, Tomcat> {
 
   public ServiceDependentResource() {
     super(Service.class);
@@ -23,6 +22,7 @@ protected Service desired(Tomcat tomcat, Context<Tomcat> context) {
         .editMetadata()
         .withName(tomcatMetadata.getName())
         .withNamespace(tomcatMetadata.getNamespace())
+        .addToLabels("app.kubernetes.io/managed-by", "tomcat-operator")
         .endMetadata()
         .editSpec()
         .addToSelector("app", tomcatMetadata.getName())