wip

Signed-off-by: Attila Mészáros <a_meszaros@apple.com>

Author: csviri

operator-framework-junit/src/main/java/io/javaoperatorsdk/operator/junit/ClusterDeployedOperatorExtension.java

@@ -23,7 +23,6 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
-import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
 import java.util.function.Function;
@@ -103,10 +102,17 @@ protected void applyCrds(ExtensionContext context) {
     final var crdPath = "./target/classes/META-INF/fabric8/";
     final var crdSuffix = "-v1.yml";
 
+    final var crdDir = new File(crdPath);
+    final var crdFiles = crdDir.listFiles((ignored, name) -> name.endsWith(crdSuffix));
+    if (crdFiles == null || crdFiles.length == 0) {
+      LOGGER.warn(
+          "No CRD files found with suffix '{}' in directory: {}",
+          crdSuffix,
+          crdDir.getAbsolutePath());
+    }
+
     final var kubernetesClient = getInfrastructureKubernetesClient();
-    for (var crdFile :
-        Objects.requireNonNull(
-            new File(crdPath).listFiles((ignored, name) -> name.endsWith(crdSuffix)))) {
+    for (var crdFile : crdFiles != null ? crdFiles : new File[0]) {
       try (InputStream is = new FileInputStream(crdFile)) {
         final var crd = kubernetesClient.load(is);
         crd.createOrReplace();

operator-framework-junit/src/main/java/io/javaoperatorsdk/operator/junit/LocallyRunOperatorExtension.java

@@ -63,8 +63,9 @@ public class LocallyRunOperatorExtension extends AbstractOperatorExtension {
   private static final int CRD_DELETE_TIMEOUT = 5000;
   private static final int CRD_DELETE_WAIT_TIMEOUT = 60000;
   private static final Set<AppliedCRD> appliedCRDs = new HashSet<>();
-  private static final boolean deleteCRDs =
+  private static final boolean DELETE_CRDS_DEFAULT =
       Boolean.parseBoolean(System.getProperty("testsuite.deleteCRDs", "true"));
+  private static volatile boolean deleteCRDs = DELETE_CRDS_DEFAULT;
 
   private final Operator operator;
   private final List<ReconcilerSpec> reconcilers;
@@ -93,7 +94,8 @@ private LocallyRunOperatorExtension(
       Function<ExtensionContext, String> namespaceNameSupplier,
       Function<ExtensionContext, String> perClassNamespaceNameSupplier,
       List<String> additionalCrds,
-      Consumer<LocallyRunOperatorExtension> beforeStartHook) {
+      Consumer<LocallyRunOperatorExtension> beforeStartHook,
+      Boolean deleteCRDsOverride) {
     super(
         infrastructure,
         infrastructureTimeout,
@@ -119,6 +121,9 @@ private LocallyRunOperatorExtension(
     this.operator = new Operator(configurationServiceOverrider);
     this.registeredControllers = new HashMap<>();
     crdMappings = getAdditionalCRDsFromFiles(additionalCrds, getKubernetesClient());
+    if (deleteCRDsOverride != null) {
+      deleteCRDs = deleteCRDsOverride;
+    }
   }
 
   static Map<String, String> getAdditionalCRDsFromFiles(
@@ -496,6 +501,7 @@ public static class Builder extends AbstractBuilder<Builder> {
     private final List<CustomResourceDefinition> additionalCustomResourceDefinitionInstances;
     private final List<String> additionalCRDs = new ArrayList<>();
     private Consumer<LocallyRunOperatorExtension> beforeStartHook;
+    private Boolean deleteCRDs;
     private KubernetesClient kubernetesClient;
     private KubernetesClient infrastructureKubernetesClient;
 
@@ -586,6 +592,11 @@ public Builder withBeforeStartHook(Consumer<LocallyRunOperatorExtension> beforeS
       return this;
     }
 
+    public Builder withDeleteCRDs(boolean deleteCRDs) {
+      this.deleteCRDs = deleteCRDs;
+      return this;
+    }
+
     public LocallyRunOperatorExtension build() {
       return new LocallyRunOperatorExtension(
           reconcilers,
@@ -604,7 +615,8 @@ public LocallyRunOperatorExtension build() {
           namespaceNameSupplier,
           perClassNamespaceNameSupplier,
           additionalCRDs,
-          beforeStartHook);
+          beforeStartHook,
+          deleteCRDs);
     }
   }
 

sample-operators/metrics-processing/src/test/java/io/javaoperatorsdk/operator/sample/metrics/MetricsHandlingE2E.java

@@ -74,6 +74,7 @@ class MetricsHandlingE2E {
           ? LocallyRunOperatorExtension.builder()
               .withReconciler(new MetricsHandlingReconciler1())
               .withReconciler(new MetricsHandlingReconciler2())
+              .withDeleteCRDs(false)
               .withConfigurationService(
                   c -> c.withMetrics(MetricsHandlingSampleOperator.initOTLPMetrics(true)))
               .build()

sample-operators/mysql-schema/src/test/java/io/javaoperatorsdk/operator/sample/MySQLSchemaOperatorE2E.java

@@ -74,6 +74,7 @@ boolean isLocal() {
               .withReconciler(new MySQLSchemaReconciler()) // configuration for schema comes from
               // SchemaDependentResource annotation
               .withInfrastructure(infrastructure)
+              .withDeleteCRDs(false)
               .withPortForward(MY_SQL_NS, "app", "mysql", 3306, SchemaDependentResource.LOCAL_PORT)
               .build()
           : ClusterDeployedOperatorExtension.builder()

sample-operators/tomcat-operator/src/test/java/io/javaoperatorsdk/operator/sample/TomcatOperatorE2E.java

@@ -63,6 +63,7 @@ boolean isLocal() {
               .waitForNamespaceDeletion(false)
               .withReconciler(new TomcatReconciler())
               .withReconciler(new WebappReconciler(client))
+              .withDeleteCRDs(false)
               .build()
           : ClusterDeployedOperatorExtension.builder()
               .waitForNamespaceDeletion(false)

sample-operators/webpage/src/test/java/io/javaoperatorsdk/operator/sample/WebPageOperatorE2E.java

@@ -43,6 +43,7 @@ public WebPageOperatorE2E() throws FileNotFoundException {}
           ? LocallyRunOperatorExtension.builder()
               .waitForNamespaceDeletion(false)
               .withReconciler(new WebPageReconciler())
+              .withDeleteCRDs(false)
               .build()
           : ClusterDeployedOperatorExtension.builder()
               .waitForNamespaceDeletion(false)