additionl IT

Author: csviri

operator-framework/src/test/java/io/javaoperatorsdk/operator/BulkDependentDeleterIT.java

@@ -0,0 +1,19 @@
+package io.javaoperatorsdk.operator;
+
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.javaoperatorsdk.operator.junit.LocallyRunOperatorExtension;
+import io.javaoperatorsdk.operator.sample.bulkdependent.ManagedDeleterBulkReconciler;
+
+public class BulkDependentDeleterIT extends BulkDependentTestBase {
+
+  @RegisterExtension
+  LocallyRunOperatorExtension extension =
+      LocallyRunOperatorExtension.builder().withReconciler(new ManagedDeleterBulkReconciler())
+          .build();
+
+  @Override
+  LocallyRunOperatorExtension extension() {
+    return extension;
+  }
+}

operator-framework/src/test/java/io/javaoperatorsdk/operator/BulkDependentTestBase.java

@@ -8,16 +8,19 @@
 import io.javaoperatorsdk.operator.junit.LocallyRunOperatorExtension;
 import io.javaoperatorsdk.operator.sample.bulkdependent.BulkDependentTestCustomResource;
 import io.javaoperatorsdk.operator.sample.bulkdependent.BulkDependentTestSpec;
+import io.javaoperatorsdk.operator.sample.bulkdependent.ConfigMapDeleterBulkDependentResource;
 
-import static io.javaoperatorsdk.operator.sample.bulkdependent.ConfigMapBulkDependentResource.LABEL_KEY;
-import static io.javaoperatorsdk.operator.sample.bulkdependent.ConfigMapBulkDependentResource.LABEL_VALUE;
+import static io.javaoperatorsdk.operator.sample.bulkdependent.ConfigMapDeleterBulkDependentResource.LABEL_KEY;
+import static io.javaoperatorsdk.operator.sample.bulkdependent.ConfigMapDeleterBulkDependentResource.LABEL_VALUE;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.awaitility.Awaitility.await;
 
 public abstract class BulkDependentTestBase {
 
   public static final String TEST_RESOURCE_NAME = "test";
   public static final int INITIAL_NUMBER_OF_CONFIG_MAPS = 3;
+  public static final String INITIAL_ADDITIONAL_DATA = "initialData";
+  public static final String NEW_VERSION_OF_ADDITIONAL_DATA = "newVersionOfAdditionalData";
 
   @Test
   public void managesBulkConfigMaps() {
@@ -34,6 +37,16 @@ public void managesBulkConfigMaps() {
     assertNumberOfConfigMaps(0);
   }
 
+  @Test
+  public void updatesData() {
+    extension().create(testResource());
+    assertNumberOfConfigMaps(3);
+    assertAdditionalDataOnConfigMaps(INITIAL_ADDITIONAL_DATA);
+
+    updateSpecWithNewAdditionalData(NEW_VERSION_OF_ADDITIONAL_DATA);
+    assertAdditionalDataOnConfigMaps(NEW_VERSION_OF_ADDITIONAL_DATA);
+  }
+
   private void assertNumberOfConfigMaps(int n) {
     // this test was failing with a lower timeout on GitHub, probably the garbage collection was
     // slower there.
@@ -48,15 +61,35 @@ private void assertNumberOfConfigMaps(int n) {
         });
   }
 
+  private void assertAdditionalDataOnConfigMaps(String expectedValue) {
+    await().atMost(Duration.ofSeconds(30))
+        .untilAsserted(() -> {
+          var cms =
+              extension().getKubernetesClient().configMaps().inNamespace(extension().getNamespace())
+                  .withLabel(LABEL_KEY, LABEL_VALUE)
+                  .list().getItems();
+          cms.forEach(cm -> {
+            assertThat(cm.getData().get(ConfigMapDeleterBulkDependentResource.ADDITIONAL_DATA_KEY))
+                .isEqualTo(expectedValue);
+          });
+        });
+  }
+
   private BulkDependentTestCustomResource testResource() {
     BulkDependentTestCustomResource cr = new BulkDependentTestCustomResource();
     cr.setMetadata(new ObjectMeta());
     cr.getMetadata().setName(TEST_RESOURCE_NAME);
     cr.setSpec(new BulkDependentTestSpec());
     cr.getSpec().setNumberOfResources(INITIAL_NUMBER_OF_CONFIG_MAPS);
+    cr.getSpec().setAdditionalData(INITIAL_ADDITIONAL_DATA);
     return cr;
   }
 
+  private void updateSpecWithNewAdditionalData(String data) {
+    var resource = testResource();
+    resource.getSpec().setAdditionalData(data);
+    extension().replace(resource);
+  }
 
   private void updateSpecWithNumber(int n) {
     var resource = testResource();

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/bulkdependent/BulkDependentTestSpec.java

@@ -3,6 +3,7 @@
 public class BulkDependentTestSpec {
 
   private Integer numberOfResources;
+  private String additionalData;
 
   public Integer getNumberOfResources() {
     return numberOfResources;
@@ -12,4 +13,13 @@ public BulkDependentTestSpec setNumberOfResources(Integer numberOfResources) {
     this.numberOfResources = numberOfResources;
     return this;
   }
+
+  public BulkDependentTestSpec setAdditionalData(String additionalData) {
+    this.additionalData = additionalData;
+    return this;
+  }
+
+  public String getAdditionalData() {
+    return additionalData;
+  }
 }

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/bulkdependent/CRUDConfigMapBulkDependentResource.java

@@ -0,0 +1,7 @@
+package io.javaoperatorsdk.operator.sample.bulkdependent;
+
+import io.javaoperatorsdk.operator.api.reconciler.dependent.GarbageCollected;
+
+public class CRUDConfigMapBulkDependentResource extends ConfigMapDeleterBulkDependentResource
+    implements GarbageCollected<BulkDependentTestCustomResource> {
+}

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/bulkdependent/ConfigMapBulkDependentResource.java renamed to operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/bulkdependent/ConfigMapDeleterBulkDependentResource.java

@@ -4,24 +4,31 @@
 import java.util.Optional;
 import java.util.stream.Collectors;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import io.fabric8.kubernetes.api.model.ConfigMap;
 import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
 import io.javaoperatorsdk.operator.api.reconciler.Context;
+import io.javaoperatorsdk.operator.api.reconciler.dependent.Deleter;
 import io.javaoperatorsdk.operator.processing.dependent.BulkDependentResource;
 import io.javaoperatorsdk.operator.processing.dependent.BulkResourceDiscriminatorFactory;
+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.KubernetesDependentResource;
 
-public class ConfigMapBulkDependentResource
-    extends CRUDKubernetesDependentResource<ConfigMap, BulkDependentTestCustomResource>
-    implements BulkDependentResource<ConfigMap, BulkDependentTestCustomResource> {
-
-  private final static Logger log = LoggerFactory.getLogger(ConfigMapBulkDependentResource.class);
+/**
+ * Not using CRUDKubernetesDependentResource so the delete functionality can be tested.
+ */
+public class ConfigMapDeleterBulkDependentResource
+    extends
+    KubernetesDependentResource<ConfigMap, BulkDependentTestCustomResource>
+    implements Creator<ConfigMap, BulkDependentTestCustomResource>,
+    Updater<ConfigMap, BulkDependentTestCustomResource>,
+    Deleter<BulkDependentTestCustomResource>,
+    BulkDependentResource<ConfigMap, BulkDependentTestCustomResource> {
 
   public static final String LABEL_KEY = "bulk";
   public static final String LABEL_VALUE = "true";
+  public static final String ADDITIONAL_DATA_KEY = "additionalData";
   private BulkResourceDiscriminatorFactory<ConfigMap, BulkDependentTestCustomResource> factory =
       index -> (resource, primary, context) -> {
         var resources = context.getSecondaryResources(resource).stream()
@@ -36,7 +43,7 @@ public class ConfigMapBulkDependentResource
         }
       };
 
-  public ConfigMapBulkDependentResource() {
+  public ConfigMapDeleterBulkDependentResource() {
     super(ConfigMap.class);
   }
 
@@ -49,7 +56,8 @@ public ConfigMap desired(BulkDependentTestCustomResource primary,
         .withNamespace(primary.getMetadata().getNamespace())
         .withLabels(Map.of(LABEL_KEY, LABEL_VALUE))
         .build());
-    configMap.setData(Map.of("number", "" + index));
+    configMap.setData(
+        Map.of("number", "" + index, ADDITIONAL_DATA_KEY, primary.getSpec().getAdditionalData()));
     return configMap;
   }
 

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/bulkdependent/ManagedBulkDependentReconciler.java

@@ -8,7 +8,7 @@
 import io.javaoperatorsdk.operator.api.reconciler.UpdateControl;
 import io.javaoperatorsdk.operator.api.reconciler.dependent.Dependent;
 
-@ControllerConfiguration(dependents = @Dependent(type = ConfigMapBulkDependentResource.class))
+@ControllerConfiguration(dependents = @Dependent(type = CRUDConfigMapBulkDependentResource.class))
 public class ManagedBulkDependentReconciler
     implements Reconciler<BulkDependentTestCustomResource> {
 
@@ -20,7 +20,6 @@ public UpdateControl<BulkDependentTestCustomResource> reconcile(
       Context<BulkDependentTestCustomResource> context) throws Exception {
 
     numberOfExecutions.addAndGet(1);
-
     return UpdateControl.noUpdate();
   }
 }

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/bulkdependent/ManagedDeleterBulkReconciler.java

@@ -0,0 +1,20 @@
+package io.javaoperatorsdk.operator.sample.bulkdependent;
+
+import io.javaoperatorsdk.operator.api.reconciler.Context;
+import io.javaoperatorsdk.operator.api.reconciler.ControllerConfiguration;
+import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
+import io.javaoperatorsdk.operator.api.reconciler.UpdateControl;
+import io.javaoperatorsdk.operator.api.reconciler.dependent.Dependent;
+
+@ControllerConfiguration(
+    dependents = @Dependent(type = ConfigMapDeleterBulkDependentResource.class))
+public class ManagedDeleterBulkReconciler implements Reconciler<BulkDependentTestCustomResource> {
+  @Override
+  public UpdateControl<BulkDependentTestCustomResource> reconcile(
+      BulkDependentTestCustomResource resource,
+      Context<BulkDependentTestCustomResource> context)
+      throws Exception {
+
+    return UpdateControl.noUpdate();
+  }
+}

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/bulkdependent/StandaloneBulkDependentReconciler.java

@@ -16,11 +16,11 @@ public class StandaloneBulkDependentReconciler
 
   private final AtomicInteger numberOfExecutions = new AtomicInteger(0);
 
-  private ConfigMapBulkDependentResource dependent;
+  private ConfigMapDeleterBulkDependentResource dependent;
   private KubernetesClient kubernetesClient;
 
   public StandaloneBulkDependentReconciler() {
-    dependent = new ConfigMapBulkDependentResource();
+    dependent = new CRUDConfigMapBulkDependentResource();
   }
 
   @Override