From 19f695b3f7d725e3b8a0f429df9f036c0a823f4c Mon Sep 17 00:00:00 2001 From: csviri Date: Wed, 23 Mar 2022 09:08:27 +0100 Subject: [PATCH 1/3] fix: Issue for "Operator Couldn't start source ..." --- .../io/javaoperatorsdk/operator/junit/OperatorExtension.java | 2 +- .../operator/sample/event/EventSourceTestCustomReconciler.java | 2 -- .../java/io/javaoperatorsdk/operator/support/TestUtils.java | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/operator-framework-junit5/src/main/java/io/javaoperatorsdk/operator/junit/OperatorExtension.java b/operator-framework-junit5/src/main/java/io/javaoperatorsdk/operator/junit/OperatorExtension.java index c445acf67c..4a1e8f6008 100644 --- a/operator-framework-junit5/src/main/java/io/javaoperatorsdk/operator/junit/OperatorExtension.java +++ b/operator-framework-junit5/src/main/java/io/javaoperatorsdk/operator/junit/OperatorExtension.java @@ -100,7 +100,7 @@ protected void before(ExtensionContext context) { try (InputStream is = getClass().getResourceAsStream(path)) { final var crd = kubernetesClient.load(is); crd.createOrReplace(); - crd.waitUntilReady(2, TimeUnit.SECONDS); + Thread.sleep(2000); // readiness is not applicable for CRD we just wait LOGGER.debug("Applied CRD with name: {}", config.getResourceTypeName()); } catch (Exception ex) { throw new IllegalStateException("Cannot apply CRD yaml: " + path, ex); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/event/EventSourceTestCustomReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/event/EventSourceTestCustomReconciler.java index cc4d083372..b4fa30c9c1 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/event/EventSourceTestCustomReconciler.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/event/EventSourceTestCustomReconciler.java @@ -12,8 +12,6 @@ public class EventSourceTestCustomReconciler implements Reconciler, TestExecutionInfoProvider { - public static final String FINALIZER_NAME = - ReconcilerUtils.getDefaultFinalizerName(EventSourceTestCustomResource.class); public static final int TIMER_PERIOD = 500; private final AtomicInteger numberOfExecutions = new AtomicInteger(0); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/support/TestUtils.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/support/TestUtils.java index c2b5841d68..f78aa0266a 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/support/TestUtils.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/support/TestUtils.java @@ -12,7 +12,6 @@ public class TestUtils { public static final String TEST_CUSTOM_RESOURCE_PREFIX = "test-custom-resource-"; public static final String TEST_CUSTOM_RESOURCE_NAME = "test-custom-resource"; - public static final String TEST_NAMESPACE = "java-operator-sdk-int-test"; public static TestCustomResource testCustomResource() { return testCustomResource(UUID.randomUUID().toString()); From 6a4aae66a6dddf74f8997e61e8d353ef31719a79 Mon Sep 17 00:00:00 2001 From: csviri Date: Wed, 23 Mar 2022 09:21:02 +0100 Subject: [PATCH 2/3] fix: small fixes --- .../io/javaoperatorsdk/operator/junit/OperatorExtension.java | 4 +++- .../sample/event/EventSourceTestCustomReconciler.java | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/operator-framework-junit5/src/main/java/io/javaoperatorsdk/operator/junit/OperatorExtension.java b/operator-framework-junit5/src/main/java/io/javaoperatorsdk/operator/junit/OperatorExtension.java index 4a1e8f6008..0ab624c4eb 100644 --- a/operator-framework-junit5/src/main/java/io/javaoperatorsdk/operator/junit/OperatorExtension.java +++ b/operator-framework-junit5/src/main/java/io/javaoperatorsdk/operator/junit/OperatorExtension.java @@ -4,7 +4,6 @@ import java.time.Duration; import java.util.ArrayList; import java.util.List; -import java.util.concurrent.TimeUnit; import java.util.function.Consumer; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -102,6 +101,9 @@ protected void before(ExtensionContext context) { crd.createOrReplace(); Thread.sleep(2000); // readiness is not applicable for CRD we just wait LOGGER.debug("Applied CRD with name: {}", config.getResourceTypeName()); + } catch (InterruptedException ex) { + LOGGER.error("Interrupted.", ex); + Thread.currentThread().interrupt(); } catch (Exception ex) { throw new IllegalStateException("Cannot apply CRD yaml: " + path, ex); } diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/event/EventSourceTestCustomReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/event/EventSourceTestCustomReconciler.java index b4fa30c9c1..67c5e09b25 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/event/EventSourceTestCustomReconciler.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/event/EventSourceTestCustomReconciler.java @@ -2,7 +2,6 @@ import java.util.concurrent.atomic.AtomicInteger; -import io.javaoperatorsdk.operator.ReconcilerUtils; import io.javaoperatorsdk.operator.api.reconciler.*; import io.javaoperatorsdk.operator.api.reconciler.ControllerConfiguration; import io.javaoperatorsdk.operator.support.TestExecutionInfoProvider; From 08e01b58e34c4abdd4b9b1b6b813198b2ac7549c Mon Sep 17 00:00:00 2001 From: csviri Date: Wed, 23 Mar 2022 09:25:45 +0100 Subject: [PATCH 3/3] fix: comment --- .../io/javaoperatorsdk/operator/junit/OperatorExtension.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/operator-framework-junit5/src/main/java/io/javaoperatorsdk/operator/junit/OperatorExtension.java b/operator-framework-junit5/src/main/java/io/javaoperatorsdk/operator/junit/OperatorExtension.java index 0ab624c4eb..e4d3b23b75 100644 --- a/operator-framework-junit5/src/main/java/io/javaoperatorsdk/operator/junit/OperatorExtension.java +++ b/operator-framework-junit5/src/main/java/io/javaoperatorsdk/operator/junit/OperatorExtension.java @@ -99,7 +99,7 @@ protected void before(ExtensionContext context) { try (InputStream is = getClass().getResourceAsStream(path)) { final var crd = kubernetesClient.load(is); crd.createOrReplace(); - Thread.sleep(2000); // readiness is not applicable for CRD we just wait + Thread.sleep(2000); // readiness is not applicable for CRD, just wait a little LOGGER.debug("Applied CRD with name: {}", config.getResourceTypeName()); } catch (InterruptedException ex) { LOGGER.error("Interrupted.", ex);