commit 9504aa8e41bf6bc7df2973bca8c59353421fd0df
author Thomas Draebing <thomas.draebing@sap.com> Tue Aug 23 14:03:52 2022 +0200
committer Thomas Draebing <thomas.draebing@sap.com> Mon Oct 17 09:44:03 2022 +0200
tree 5ed23ab48fd0705ba3bd231ea2f61fc644b1a80b
parent d1f8a64e527b40f32d1d9a1a68b9acc5caf34911

Clean up after operator tests

The junit extensions provided by the java-operator-sdk tries to
delete resources after running the tests. However, this did not
always work correctly and some resources remained.

Change-Id: I8e92d44c62776aa249fa3a68f8fc395ea2b6d403

operator/src/test/java/com/google/gerrit/k8s/operator/cluster/GerritClusterE2E.java

diff --git a/operator/src/test/java/com/google/gerrit/k8s/operator/cluster/GerritClusterE2E.java b/operator/src/test/java/com/google/gerrit/k8s/operator/cluster/GerritClusterE2E.java
index 272dfb6..4dbeebd 100644
--- a/operator/src/test/java/com/google/gerrit/k8s/operator/cluster/GerritClusterE2E.java
+++ b/operator/src/test/java/com/google/gerrit/k8s/operator/cluster/GerritClusterE2E.java
@@ -28,6 +28,7 @@
 import io.fabric8.kubernetes.api.model.Quantity;
 import io.fabric8.kubernetes.client.KubernetesClient;
 import io.javaoperatorsdk.operator.junit.LocallyRunOperatorExtension;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
@@ -107,6 +108,11 @@
     logger.atInfo().log("Deleting test cluster object: %s", cluster);
   }
 
+  @AfterEach
+  void cleanup() {
+    client.resources(GerritCluster.class).inNamespace(operator.getNamespace()).delete();
+  }
+
   private GerritCluster createGerritCluster(boolean isNfsEnbaled) {
     GerritCluster cluster = new GerritCluster();
 

operator/src/test/java/com/google/gerrit/k8s/operator/gitgc/GitGarbageCollectionE2E.java

diff --git a/operator/src/test/java/com/google/gerrit/k8s/operator/gitgc/GitGarbageCollectionE2E.java b/operator/src/test/java/com/google/gerrit/k8s/operator/gitgc/GitGarbageCollectionE2E.java
index d8b0c5e..1a3f0a3 100644
--- a/operator/src/test/java/com/google/gerrit/k8s/operator/gitgc/GitGarbageCollectionE2E.java
+++ b/operator/src/test/java/com/google/gerrit/k8s/operator/gitgc/GitGarbageCollectionE2E.java
@@ -39,6 +39,7 @@
 import io.javaoperatorsdk.operator.junit.LocallyRunOperatorExtension;
 import java.util.List;
 import java.util.Set;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
@@ -194,6 +195,12 @@
     assertNull(cronJob);
   }
 
+  @AfterEach
+  void cleanup() {
+    client.resources(GitGarbageCollection.class).inNamespace(operator.getNamespace()).delete();
+    client.resources(GerritCluster.class).inNamespace(operator.getNamespace()).delete();
+  }
+
   private void createCluster() {
     GerritCluster cluster = new GerritCluster();