Add 60s periodic reconcile, wait for deleted test resources, host req'd

Signed-off-by: Michael Edgar <[email protected]>
streamshub · Jul 2, 2024 · 2174da1 · 2174da1
1 parent 79cff49
commit 2174da1
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 13 deletions.
diff --git a/operator/src/main/java/com/github/streamshub/console/ConsoleReconciler.java b/operator/src/main/java/com/github/streamshub/console/ConsoleReconciler.java
@@ -4,6 +4,7 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
 import com.github.streamshub.console.api.v1alpha1.Console;
@@ -33,6 +34,7 @@
 import io.javaoperatorsdk.operator.api.reconciler.ErrorStatusUpdateControl;
 import io.javaoperatorsdk.operator.api.reconciler.EventSourceContext;
 import io.javaoperatorsdk.operator.api.reconciler.EventSourceInitializer;
+import io.javaoperatorsdk.operator.api.reconciler.MaxReconciliationInterval;
 import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
 import io.javaoperatorsdk.operator.api.reconciler.UpdateControl;
 import io.javaoperatorsdk.operator.api.reconciler.dependent.Dependent;
@@ -41,7 +43,11 @@
 import io.quarkiverse.operatorsdk.annotations.CSVMetadata.InstallMode;
 import io.quarkiverse.operatorsdk.annotations.CSVMetadata.Provider;
 
-@ControllerConfiguration(dependents = {
+@ControllerConfiguration(
+        maxReconciliationInterval = @MaxReconciliationInterval(
+                interval = 60,
+                timeUnit = TimeUnit.SECONDS),
+        dependents = {
         @Dependent(
                 name = PrometheusClusterRole.NAME,
                 type = PrometheusClusterRole.class),

diff --git a/operator/src/main/java/com/github/streamshub/console/api/v1alpha1/spec/ConsoleSpec.java b/operator/src/main/java/com/github/streamshub/console/api/v1alpha1/spec/ConsoleSpec.java
@@ -5,13 +5,15 @@
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 
+import io.fabric8.generator.annotation.Required;
 import io.fabric8.kubernetes.api.model.EnvVar;
 import io.sundr.builder.annotations.Buildable;
 
 @Buildable(builderPackage = "io.fabric8.kubernetes.api.builder")
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class ConsoleSpec {
 
+    @Required
     String hostname;
 
     Images images = new Images();

diff --git a/operator/src/test/java/com/github/streamshub/console/ConsoleReconcilerTest.java b/operator/src/test/java/com/github/streamshub/console/ConsoleReconcilerTest.java
@@ -15,7 +15,6 @@
 import io.fabric8.kubernetes.api.model.NamespaceBuilder;
 import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
 import io.fabric8.kubernetes.client.KubernetesClient;
-import io.fabric8.kubernetes.client.KubernetesClientException;
 import io.javaoperatorsdk.operator.Operator;
 import io.quarkus.test.junit.QuarkusTest;
 import io.strimzi.api.kafka.Crds;
@@ -42,20 +41,20 @@ class ConsoleReconcilerTest {
 
     @BeforeEach
     void setUp() throws Exception {
-        client.resources(Console.class).inAnyNamespace().delete();
+        client.resource(Crds.kafka()).serverSideApply();
 
-        try {
-            client.resources(Kafka.class).inAnyNamespace().delete();
-        } catch (KubernetesClientException e) {
-            if (e.getStatus().getCode() != 404) {
-                throw e;
-            }
-        }
+        var allConsoles = client.resources(Console.class).inAnyNamespace();
+        var allKafkas = client.resources(Kafka.class).inAnyNamespace();
 
-        operator.start();
+        allConsoles.delete();
+        allKafkas.delete();
 
-        client.resource(Crds.kafka())
-            .serverSideApply();
+        await().atMost(10, TimeUnit.SECONDS).untilAsserted(() -> {
+            assertTrue(allConsoles.list().getItems().isEmpty());
+            assertTrue(allKafkas.list().getItems().isEmpty());
+        });
+
+        operator.start();
 
         client.resource(new NamespaceBuilder()
                 .withNewMetadata()