fix: naming and cleanup (#74)

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

Author: csviri

src/test/java/io/csviri/operator/resourceglue/GlueOperatorTest.java

@@ -18,6 +18,7 @@
 import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
 import io.quarkus.test.junit.QuarkusTest;
 
+import static io.csviri.operator.resourceglue.TestUtils.GC_WAIT_TIMEOUT_SECOND;
 import static io.csviri.operator.resourceglue.customresource.TestCustomResource.CR_GROUP;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.awaitility.Awaitility.await;
@@ -139,12 +140,13 @@ void simpleConcurrencyForMultipleOperatorTest() {
     crs.forEach(this::delete);
     cr2s.forEach(this::delete);
 
-    await().untilAsserted(() -> IntStream.range(0, num).forEach(n -> {
-      var cm = get(ConfigMap.class, TEST_RESOURCE_PREFIX + n);
-      assertThat(cm).isNull();
-      var cm2 = get(ConfigMap.class, TEST_RESOURCE2_PREFIX + n);
-      assertThat(cm2).isNull();
-    }));
+    await().timeout(GC_WAIT_TIMEOUT_SECOND)
+        .untilAsserted(() -> IntStream.range(0, num).forEach(n -> {
+          var cm = get(ConfigMap.class, TEST_RESOURCE_PREFIX + n);
+          assertThat(cm).isNull();
+          var cm2 = get(ConfigMap.class, TEST_RESOURCE2_PREFIX + n);
+          assertThat(cm2).isNull();
+        }));
   }
 
   TestCustomResource testCustomResource() {

src/test/java/io/csviri/operator/resourceglue/TestUtils.java

@@ -3,6 +3,7 @@
 import java.io.*;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
+import java.time.Duration;
 import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
@@ -25,6 +26,8 @@
 
 public class TestUtils {
 
+  public static final Duration GC_WAIT_TIMEOUT_SECOND = Duration.ofSeconds(30);
+
   public static final int CRD_READY_WAIT = 1000;
 
   private static final Logger log = LoggerFactory.getLogger(TestUtils.class);

src/test/java/io/csviri/operator/resourceglue/sample/mutation/MutationWebhookDeploymentE2E.java

@@ -16,6 +16,7 @@
 import io.fabric8.kubernetes.client.KubernetesClientBuilder;
 import io.fabric8.kubernetes.client.dsl.NonDeletingOperation;
 
+import static io.csviri.operator.resourceglue.TestUtils.GC_WAIT_TIMEOUT_SECOND;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.awaitility.Awaitility.await;
 
@@ -37,7 +38,7 @@ void applyCRDs() throws MalformedURLException, URISyntaxException {
 
   @Test
   void testMutationHookDeployment() {
-    client.resource(TestUtils.load("/sample/mutation/mutation.glue.yaml"))
+    var glue = client.resource(TestUtils.load("/sample/mutation/mutation.glue.yaml"))
         .createOr(NonDeletingOperation::update);
 
     await().atMost(Duration.ofMinutes(5)).untilAsserted(() -> {
@@ -51,6 +52,13 @@ void testMutationHookDeployment() {
     var pod = client.resource(testPod()).create();
     assertThat(pod.getMetadata().getAnnotations()).containsEntry("sample.annotation.present",
         "true");
+
+    client.resource(glue).delete();
+
+    await().timeout(GC_WAIT_TIMEOUT_SECOND).untilAsserted(() -> {
+      var deployment = client.apps().deployments().withName("pod-mutating-hook").get();
+      assertThat(deployment).isNull();
+    });
   }
 
   Pod testPod() {

src/test/java/io/csviri/operator/resourceglue/sample/webpage/WebPageE2E.java

@@ -1,12 +1,12 @@
-package io.csviri.operator.resourceglue;
+package io.csviri.operator.resourceglue.sample.webpage;
 
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
+import io.csviri.operator.resourceglue.TestUtils;
 import io.csviri.operator.resourceglue.customresource.glue.Glue;
 import io.csviri.operator.resourceglue.customresource.operator.GlueOperator;
-import io.csviri.operator.resourceglue.sample.webpage.WebPage;
 import io.fabric8.kubernetes.api.model.ConfigMap;
 import io.fabric8.kubernetes.api.model.Service;
 import io.fabric8.kubernetes.api.model.apps.Deployment;
@@ -15,6 +15,7 @@
 import io.fabric8.kubernetes.client.KubernetesClientBuilder;
 import io.fabric8.kubernetes.client.dsl.NonDeletingOperation;
 
+import static io.csviri.operator.resourceglue.TestUtils.GC_WAIT_TIMEOUT_SECOND;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.awaitility.Awaitility.await;
 
@@ -61,7 +62,7 @@ void testWebPageCRUDOperations() {
 
     client.resource(createdWebPage).delete();
 
-    await().untilAsserted(() -> {
+    await().timeout(GC_WAIT_TIMEOUT_SECOND).untilAsserted(() -> {
       var deployment =
           client.resources(Deployment.class).withName(webPage.getMetadata().getName()).get();
       var configMap =

src/test/resources/resourceglueoperator/Simple.yaml

@@ -1,7 +1,7 @@
 apiVersion: io.csviri.operator.resourceglue/v1beta1
 kind: GlueOperator
 metadata:
-  name: rfo-templating-sample
+  name: templating-sample
 spec:
   parent:
     apiVersion: io.csviri.operator.resourceglue/v1