From da9fe37647dbaa20cc9b60c9123c5a0bc67adb9c Mon Sep 17 00:00:00 2001 From: soroosh Date: Fri, 18 Dec 2020 14:18:40 +0100 Subject: [PATCH 1/8] Introduce AbstractOperator --- .../{Operator.java => AbstractOperator.java} | 6 +++--- .../extension/ConfigurationServiceRecorder.java | 3 +-- .../quarkus/extension/OperatorProducer.java | 7 +++---- .../quarkus/extension/QuarkusOperator.java | 12 ++++++++++++ .../starter/OperatorAutoConfiguration.java | 6 ++---- .../java/io/javaoperatorsdk/operator/Operator.java | 10 ++++++++++ .../operator/ControllerExecutionIT.java | 2 +- .../java/io/javaoperatorsdk/operator/RetryIT.java | 2 +- .../DoubleUpdateTestCustomResourceController.java | 6 +++++- .../operator/sample/QuarkusOperator.java | 4 ++-- .../operator/sample/TomcatController.java | 6 +++++- .../operator/sample/WebappController.java | 6 +++++- 12 files changed, 50 insertions(+), 20 deletions(-) rename operator-framework-core/src/main/java/io/javaoperatorsdk/operator/{Operator.java => AbstractOperator.java} (97%) create mode 100644 operator-framework-quarkus-extension/runtime/src/main/java/io/javaoperatorsdk/quarkus/extension/QuarkusOperator.java create mode 100644 operator-framework/src/main/java/io/javaoperatorsdk/operator/Operator.java diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/Operator.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/AbstractOperator.java similarity index 97% rename from operator-framework-core/src/main/java/io/javaoperatorsdk/operator/Operator.java rename to operator-framework-core/src/main/java/io/javaoperatorsdk/operator/AbstractOperator.java index ebec85bcda..f429e06fbc 100644 --- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/Operator.java +++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/AbstractOperator.java @@ -25,15 +25,15 @@ import org.slf4j.LoggerFactory; @SuppressWarnings("rawtypes") -public class Operator { +public abstract class AbstractOperator { - private static final Logger log = LoggerFactory.getLogger(Operator.class); + private static final Logger log = LoggerFactory.getLogger(AbstractOperator.class); private final KubernetesClient k8sClient; private final ConfigurationService configurationService; private Map, CustomResourceOperationsImpl> customResourceClients = new HashMap<>(); - public Operator(KubernetesClient k8sClient, ConfigurationService configurationService) { + public AbstractOperator(KubernetesClient k8sClient, ConfigurationService configurationService) { this.k8sClient = k8sClient; this.configurationService = configurationService; } diff --git a/operator-framework-quarkus-extension/runtime/src/main/java/io/javaoperatorsdk/quarkus/extension/ConfigurationServiceRecorder.java b/operator-framework-quarkus-extension/runtime/src/main/java/io/javaoperatorsdk/quarkus/extension/ConfigurationServiceRecorder.java index ac0964cf65..d151b4a54a 100644 --- a/operator-framework-quarkus-extension/runtime/src/main/java/io/javaoperatorsdk/quarkus/extension/ConfigurationServiceRecorder.java +++ b/operator-framework-quarkus-extension/runtime/src/main/java/io/javaoperatorsdk/quarkus/extension/ConfigurationServiceRecorder.java @@ -1,6 +1,5 @@ package io.javaoperatorsdk.quarkus.extension; -import io.javaoperatorsdk.operator.api.config.ConfigurationService; import io.javaoperatorsdk.operator.api.config.ControllerConfiguration; import io.quarkus.runtime.annotations.Recorder; import java.util.List; @@ -9,7 +8,7 @@ @Recorder public class ConfigurationServiceRecorder { - public Supplier configurationServiceSupplier( + public Supplier configurationServiceSupplier( List controllerConfigs) { return () -> new QuarkusConfigurationService(controllerConfigs); } diff --git a/operator-framework-quarkus-extension/runtime/src/main/java/io/javaoperatorsdk/quarkus/extension/OperatorProducer.java b/operator-framework-quarkus-extension/runtime/src/main/java/io/javaoperatorsdk/quarkus/extension/OperatorProducer.java index 7ad1cbac56..543648423f 100644 --- a/operator-framework-quarkus-extension/runtime/src/main/java/io/javaoperatorsdk/quarkus/extension/OperatorProducer.java +++ b/operator-framework-quarkus-extension/runtime/src/main/java/io/javaoperatorsdk/quarkus/extension/OperatorProducer.java @@ -2,9 +2,8 @@ import io.fabric8.kubernetes.client.CustomResource; import io.fabric8.kubernetes.client.KubernetesClient; -import io.javaoperatorsdk.operator.Operator; +import io.javaoperatorsdk.operator.AbstractOperator; import io.javaoperatorsdk.operator.api.ResourceController; -import io.javaoperatorsdk.operator.api.config.ConfigurationService; import io.quarkus.arc.DefaultBean; import javax.enterprise.inject.Instance; import javax.enterprise.inject.Produces; @@ -19,8 +18,8 @@ public class OperatorProducer { @Produces @DefaultBean @Singleton - Operator operator(KubernetesClient client, ConfigurationService configuration) { - final var operator = new Operator(client, configuration); + AbstractOperator operator(KubernetesClient client, QuarkusConfigurationService configuration) { + final var operator = new QuarkusOperator(client, configuration); controllers.stream().forEach(operator::register); return operator; } diff --git a/operator-framework-quarkus-extension/runtime/src/main/java/io/javaoperatorsdk/quarkus/extension/QuarkusOperator.java b/operator-framework-quarkus-extension/runtime/src/main/java/io/javaoperatorsdk/quarkus/extension/QuarkusOperator.java new file mode 100644 index 0000000000..a2b6b9a3b6 --- /dev/null +++ b/operator-framework-quarkus-extension/runtime/src/main/java/io/javaoperatorsdk/quarkus/extension/QuarkusOperator.java @@ -0,0 +1,12 @@ +package io.javaoperatorsdk.quarkus.extension; + +import io.fabric8.kubernetes.client.KubernetesClient; +import io.javaoperatorsdk.operator.AbstractOperator; + +public class QuarkusOperator extends AbstractOperator { + + public QuarkusOperator( + KubernetesClient k8sClient, QuarkusConfigurationService configurationService) { + super(k8sClient, configurationService); + } +} diff --git a/operator-framework-spring-boot-starter/src/main/java/io/javaoperatorsdk/operator/springboot/starter/OperatorAutoConfiguration.java b/operator-framework-spring-boot-starter/src/main/java/io/javaoperatorsdk/operator/springboot/starter/OperatorAutoConfiguration.java index 9993d83569..f5f9388611 100644 --- a/operator-framework-spring-boot-starter/src/main/java/io/javaoperatorsdk/operator/springboot/starter/OperatorAutoConfiguration.java +++ b/operator-framework-spring-boot-starter/src/main/java/io/javaoperatorsdk/operator/springboot/starter/OperatorAutoConfiguration.java @@ -55,10 +55,8 @@ public Config getClientConfiguration() { @Bean @ConditionalOnMissingBean(Operator.class) public Operator operator( - KubernetesClient kubernetesClient, - ConfigurationProperties config, - List resourceControllers) { - Operator operator = new Operator(kubernetesClient, this); + KubernetesClient kubernetesClient, List resourceControllers) { + final var operator = new Operator(kubernetesClient, this); resourceControllers.forEach(r -> operator.register(processController(r))); return operator; } diff --git a/operator-framework/src/main/java/io/javaoperatorsdk/operator/Operator.java b/operator-framework/src/main/java/io/javaoperatorsdk/operator/Operator.java new file mode 100644 index 0000000000..151eaee102 --- /dev/null +++ b/operator-framework/src/main/java/io/javaoperatorsdk/operator/Operator.java @@ -0,0 +1,10 @@ +package io.javaoperatorsdk.operator; + +import io.fabric8.kubernetes.client.KubernetesClient; +import io.javaoperatorsdk.operator.api.config.ConfigurationService; + +public class Operator extends AbstractOperator { + public Operator(KubernetesClient k8sClient, ConfigurationService configurationService) { + super(k8sClient, configurationService); + } +} diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/ControllerExecutionIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/ControllerExecutionIT.java index 505e986a3a..2bab2224d4 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/ControllerExecutionIT.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/ControllerExecutionIT.java @@ -1,6 +1,6 @@ package io.javaoperatorsdk.operator; -import static org.assertj.core.api.Assertions.*; +import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; import io.fabric8.kubernetes.api.model.ConfigMap; diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/RetryIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/RetryIT.java index ef19561f02..970df02e65 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/RetryIT.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/RetryIT.java @@ -1,7 +1,7 @@ package io.javaoperatorsdk.operator; import static io.javaoperatorsdk.operator.IntegrationTestSupport.TEST_NAMESPACE; -import static org.assertj.core.api.Assertions.*; +import static org.assertj.core.api.Assertions.assertThat; import io.fabric8.kubernetes.api.model.ObjectMetaBuilder; import io.fabric8.kubernetes.client.DefaultKubernetesClient; diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/doubleupdate/DoubleUpdateTestCustomResourceController.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/doubleupdate/DoubleUpdateTestCustomResourceController.java index 0169ececd6..3d4589d22a 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/doubleupdate/DoubleUpdateTestCustomResourceController.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/doubleupdate/DoubleUpdateTestCustomResourceController.java @@ -1,7 +1,11 @@ package io.javaoperatorsdk.operator.sample.doubleupdate; import io.javaoperatorsdk.operator.TestExecutionInfoProvider; -import io.javaoperatorsdk.operator.api.*; +import io.javaoperatorsdk.operator.api.Context; +import io.javaoperatorsdk.operator.api.Controller; +import io.javaoperatorsdk.operator.api.DeleteControl; +import io.javaoperatorsdk.operator.api.ResourceController; +import io.javaoperatorsdk.operator.api.UpdateControl; import java.util.HashMap; import java.util.concurrent.atomic.AtomicInteger; import org.slf4j.Logger; diff --git a/samples/quarkus/src/main/java/io/javaoperatorsdk/operator/sample/QuarkusOperator.java b/samples/quarkus/src/main/java/io/javaoperatorsdk/operator/sample/QuarkusOperator.java index 7b1553d6b5..c18a8c46f7 100644 --- a/samples/quarkus/src/main/java/io/javaoperatorsdk/operator/sample/QuarkusOperator.java +++ b/samples/quarkus/src/main/java/io/javaoperatorsdk/operator/sample/QuarkusOperator.java @@ -1,7 +1,7 @@ package io.javaoperatorsdk.operator.sample; import io.fabric8.kubernetes.client.KubernetesClient; -import io.javaoperatorsdk.operator.Operator; +import io.javaoperatorsdk.operator.AbstractOperator; import io.javaoperatorsdk.operator.api.config.ConfigurationService; import io.quarkus.runtime.Quarkus; import io.quarkus.runtime.QuarkusApplication; @@ -13,7 +13,7 @@ public class QuarkusOperator implements QuarkusApplication { @Inject KubernetesClient client; - @Inject Operator operator; + @Inject AbstractOperator operator; @Inject ConfigurationService configuration; diff --git a/samples/tomcat/src/main/java/io/javaoperatorsdk/operator/sample/TomcatController.java b/samples/tomcat/src/main/java/io/javaoperatorsdk/operator/sample/TomcatController.java index 3943d41557..cb92f271ad 100644 --- a/samples/tomcat/src/main/java/io/javaoperatorsdk/operator/sample/TomcatController.java +++ b/samples/tomcat/src/main/java/io/javaoperatorsdk/operator/sample/TomcatController.java @@ -15,7 +15,11 @@ import io.fabric8.kubernetes.client.dsl.RollableScalableResource; import io.fabric8.kubernetes.client.dsl.ServiceResource; import io.fabric8.kubernetes.client.utils.Serialization; -import io.javaoperatorsdk.operator.api.*; +import io.javaoperatorsdk.operator.api.Context; +import io.javaoperatorsdk.operator.api.Controller; +import io.javaoperatorsdk.operator.api.DeleteControl; +import io.javaoperatorsdk.operator.api.ResourceController; +import io.javaoperatorsdk.operator.api.UpdateControl; import io.javaoperatorsdk.operator.processing.event.EventSourceManager; import io.javaoperatorsdk.operator.processing.event.internal.CustomResourceEvent; import java.io.IOException; diff --git a/samples/tomcat/src/main/java/io/javaoperatorsdk/operator/sample/WebappController.java b/samples/tomcat/src/main/java/io/javaoperatorsdk/operator/sample/WebappController.java index 32c3c2cd2f..97e45215b0 100644 --- a/samples/tomcat/src/main/java/io/javaoperatorsdk/operator/sample/WebappController.java +++ b/samples/tomcat/src/main/java/io/javaoperatorsdk/operator/sample/WebappController.java @@ -3,7 +3,11 @@ import io.fabric8.kubernetes.api.model.Pod; import io.fabric8.kubernetes.api.model.apps.Deployment; import io.fabric8.kubernetes.client.KubernetesClient; -import io.javaoperatorsdk.operator.api.*; +import io.javaoperatorsdk.operator.api.Context; +import io.javaoperatorsdk.operator.api.Controller; +import io.javaoperatorsdk.operator.api.DeleteControl; +import io.javaoperatorsdk.operator.api.ResourceController; +import io.javaoperatorsdk.operator.api.UpdateControl; import java.io.ByteArrayOutputStream; import java.util.List; import java.util.Objects; From dd1da067d5da9686f99109c4dcae5f00e485d258 Mon Sep 17 00:00:00 2001 From: soroosh Date: Fri, 18 Dec 2020 14:28:39 +0100 Subject: [PATCH 2/8] simplify instantiation of the operator --- README.md | 3 +- .../operator/AbstractOperator.java | 9 ++++- .../io/javaoperatorsdk/operator/Operator.java | 33 +++++++++++++++++++ .../quarkus/extension/OperatorProducer.java | 4 +-- .../starter/OperatorAutoConfiguration.java | 8 ++--- .../{Operator.java => DefaultOperator.java} | 4 +-- .../operator/IntegrationTestSupport.java | 4 +-- .../operator/sample/MySQLSchemaOperator.java | 3 +- .../sample/PureJavaApplicationRunner.java | 3 +- .../operator/sample/QuarkusOperator.java | 4 +-- .../operator/sample/SampleComponent.java | 6 ++-- .../operator/sample/Config.java | 6 ++-- .../operator/sample/TomcatOperator.java | 3 +- .../operator/sample/WebServerOperator.java | 3 +- 14 files changed, 68 insertions(+), 25 deletions(-) create mode 100644 operator-framework-core/src/main/java/io/javaoperatorsdk/operator/Operator.java rename operator-framework/src/main/java/io/javaoperatorsdk/operator/{Operator.java => DefaultOperator.java} (57%) diff --git a/README.md b/README.md index 3b456a45bd..557e9f670b 100644 --- a/README.md +++ b/README.md @@ -69,8 +69,7 @@ Main method initializing the Operator and registering a controller. public class Runner { public static void main(String[] args) { - Operator operator = new Operator(new DefaultKubernetesClient(), - DefaultConfigurationService.instance()); + Operator operator = new DefaultOperator(new DefaultKubernetesClient()); operator.register(new WebServerController()); } } diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/AbstractOperator.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/AbstractOperator.java index f429e06fbc..06f736575c 100644 --- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/AbstractOperator.java +++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/AbstractOperator.java @@ -25,7 +25,7 @@ import org.slf4j.LoggerFactory; @SuppressWarnings("rawtypes") -public abstract class AbstractOperator { +public abstract class AbstractOperator implements Operator { private static final Logger log = LoggerFactory.getLogger(AbstractOperator.class); private final KubernetesClient k8sClient; @@ -38,6 +38,7 @@ public AbstractOperator(KubernetesClient k8sClient, ConfigurationService configu this.configurationService = configurationService; } + @Override public void register(ResourceController controller) throws OperatorException { final var configuration = configurationService.getConfigurationFor(controller); @@ -46,22 +47,26 @@ public void register(ResourceController controller registerController(controller, configuration.watchAllNamespaces(), retry, targetNamespaces); } + @Override public void registerControllerForAllNamespaces( ResourceController controller, Retry retry) throws OperatorException { registerController(controller, true, retry); } + @Override public void registerControllerForAllNamespaces( ResourceController controller) throws OperatorException { registerController(controller, true, null); } + @Override public void registerController( ResourceController controller, Retry retry, String... targetNamespaces) throws OperatorException { registerController(controller, false, retry, targetNamespaces); } + @Override public void registerController( ResourceController controller, String... targetNamespaces) throws OperatorException { registerController(controller, false, null, targetNamespaces); @@ -151,11 +156,13 @@ private CustomResourceDefinitionContext getCustomResourceDefinitionForController return context; } + @Override public Map, CustomResourceOperationsImpl> getCustomResourceClients() { return customResourceClients; } + @Override public < T extends CustomResource, L extends CustomResourceList, diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/Operator.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/Operator.java new file mode 100644 index 0000000000..bd7044aa13 --- /dev/null +++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/Operator.java @@ -0,0 +1,33 @@ +package io.javaoperatorsdk.operator; + +import io.fabric8.kubernetes.client.CustomResource; +import io.fabric8.kubernetes.client.CustomResourceDoneable; +import io.fabric8.kubernetes.client.CustomResourceList; +import io.fabric8.kubernetes.client.dsl.internal.CustomResourceOperationsImpl; +import io.javaoperatorsdk.operator.api.ResourceController; +import io.javaoperatorsdk.operator.processing.retry.Retry; +import java.util.Map; + +public interface Operator { + + void register(ResourceController controller) + throws OperatorException; + + void registerControllerForAllNamespaces( + ResourceController controller, Retry retry) throws OperatorException; + + void registerControllerForAllNamespaces( + ResourceController controller) throws OperatorException; + + void registerController( + ResourceController controller, Retry retry, String... targetNamespaces) + throws OperatorException; + + void registerController( + ResourceController controller, String... targetNamespaces) throws OperatorException; + + Map, CustomResourceOperationsImpl> getCustomResourceClients(); + + , D extends CustomResourceDoneable> + CustomResourceOperationsImpl getCustomResourceClients(Class customResourceClass); +} diff --git a/operator-framework-quarkus-extension/runtime/src/main/java/io/javaoperatorsdk/quarkus/extension/OperatorProducer.java b/operator-framework-quarkus-extension/runtime/src/main/java/io/javaoperatorsdk/quarkus/extension/OperatorProducer.java index 543648423f..9cb769b2a6 100644 --- a/operator-framework-quarkus-extension/runtime/src/main/java/io/javaoperatorsdk/quarkus/extension/OperatorProducer.java +++ b/operator-framework-quarkus-extension/runtime/src/main/java/io/javaoperatorsdk/quarkus/extension/OperatorProducer.java @@ -2,7 +2,7 @@ import io.fabric8.kubernetes.client.CustomResource; import io.fabric8.kubernetes.client.KubernetesClient; -import io.javaoperatorsdk.operator.AbstractOperator; +import io.javaoperatorsdk.operator.Operator; import io.javaoperatorsdk.operator.api.ResourceController; import io.quarkus.arc.DefaultBean; import javax.enterprise.inject.Instance; @@ -18,7 +18,7 @@ public class OperatorProducer { @Produces @DefaultBean @Singleton - AbstractOperator operator(KubernetesClient client, QuarkusConfigurationService configuration) { + Operator operator(KubernetesClient client, QuarkusConfigurationService configuration) { final var operator = new QuarkusOperator(client, configuration); controllers.stream().forEach(operator::register); return operator; diff --git a/operator-framework-spring-boot-starter/src/main/java/io/javaoperatorsdk/operator/springboot/starter/OperatorAutoConfiguration.java b/operator-framework-spring-boot-starter/src/main/java/io/javaoperatorsdk/operator/springboot/starter/OperatorAutoConfiguration.java index f5f9388611..541a1f703c 100644 --- a/operator-framework-spring-boot-starter/src/main/java/io/javaoperatorsdk/operator/springboot/starter/OperatorAutoConfiguration.java +++ b/operator-framework-spring-boot-starter/src/main/java/io/javaoperatorsdk/operator/springboot/starter/OperatorAutoConfiguration.java @@ -6,7 +6,7 @@ import io.fabric8.kubernetes.client.DefaultKubernetesClient; import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.openshift.client.DefaultOpenShiftClient; -import io.javaoperatorsdk.operator.Operator; +import io.javaoperatorsdk.operator.DefaultOperator; import io.javaoperatorsdk.operator.api.ResourceController; import io.javaoperatorsdk.operator.api.config.ConfigurationService; import io.javaoperatorsdk.operator.api.config.ControllerConfiguration; @@ -53,10 +53,10 @@ public Config getClientConfiguration() { } @Bean - @ConditionalOnMissingBean(Operator.class) - public Operator operator( + @ConditionalOnMissingBean(DefaultOperator.class) + public DefaultOperator operator( KubernetesClient kubernetesClient, List resourceControllers) { - final var operator = new Operator(kubernetesClient, this); + final var operator = new DefaultOperator(kubernetesClient, this); resourceControllers.forEach(r -> operator.register(processController(r))); return operator; } diff --git a/operator-framework/src/main/java/io/javaoperatorsdk/operator/Operator.java b/operator-framework/src/main/java/io/javaoperatorsdk/operator/DefaultOperator.java similarity index 57% rename from operator-framework/src/main/java/io/javaoperatorsdk/operator/Operator.java rename to operator-framework/src/main/java/io/javaoperatorsdk/operator/DefaultOperator.java index 151eaee102..a0373fc61a 100644 --- a/operator-framework/src/main/java/io/javaoperatorsdk/operator/Operator.java +++ b/operator-framework/src/main/java/io/javaoperatorsdk/operator/DefaultOperator.java @@ -3,8 +3,8 @@ import io.fabric8.kubernetes.client.KubernetesClient; import io.javaoperatorsdk.operator.api.config.ConfigurationService; -public class Operator extends AbstractOperator { - public Operator(KubernetesClient k8sClient, ConfigurationService configurationService) { +public class DefaultOperator extends AbstractOperator { + public DefaultOperator(KubernetesClient k8sClient, ConfigurationService configurationService) { super(k8sClient, configurationService); } } diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/IntegrationTestSupport.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/IntegrationTestSupport.java index 6f54d6aa80..1281e2db9b 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/IntegrationTestSupport.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/IntegrationTestSupport.java @@ -71,7 +71,7 @@ public void initialize( .withMetadata(new ObjectMetaBuilder().withName(TEST_NAMESPACE).build()) .build()); } - operator = new Operator(k8sClient, configurationService); + operator = new DefaultOperator(k8sClient, configurationService); operator.registerController(controller, retry, TEST_NAMESPACE); log.info("Operator is running with {}", controller.getClass().getCanonicalName()); } @@ -189,7 +189,7 @@ public CustomResource getCustomResource(String name) { return getCrOperations().inNamespace(TEST_NAMESPACE).withName(name).get(); } - public Operator getOperator() { + public DefaultOperator getOperator() { return operator; } diff --git a/samples/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/MySQLSchemaOperator.java b/samples/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/MySQLSchemaOperator.java index dd6aacfb64..6e2d0e08a8 100644 --- a/samples/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/MySQLSchemaOperator.java +++ b/samples/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/MySQLSchemaOperator.java @@ -4,6 +4,7 @@ import io.fabric8.kubernetes.client.ConfigBuilder; import io.fabric8.kubernetes.client.DefaultKubernetesClient; import io.fabric8.kubernetes.client.KubernetesClient; +import io.javaoperatorsdk.operator.DefaultOperator; import io.javaoperatorsdk.operator.Operator; import io.javaoperatorsdk.operator.config.runtime.DefaultConfigurationService; import java.io.IOException; @@ -23,7 +24,7 @@ public static void main(String[] args) throws IOException { Config config = new ConfigBuilder().withNamespace(null).build(); KubernetesClient client = new DefaultKubernetesClient(config); - Operator operator = new Operator(client, DefaultConfigurationService.instance()); + Operator operator = new DefaultOperator(client, DefaultConfigurationService.instance()); operator.registerControllerForAllNamespaces(new SchemaController(client)); new FtBasic(new TkFork(new FkRegex("/health", "ALL GOOD!")), 8080).start(Exit.NEVER); diff --git a/samples/pure-java/src/main/java/io/javaoperatorsdk/operator/sample/PureJavaApplicationRunner.java b/samples/pure-java/src/main/java/io/javaoperatorsdk/operator/sample/PureJavaApplicationRunner.java index e2ab96617b..2d4cc1c4cd 100644 --- a/samples/pure-java/src/main/java/io/javaoperatorsdk/operator/sample/PureJavaApplicationRunner.java +++ b/samples/pure-java/src/main/java/io/javaoperatorsdk/operator/sample/PureJavaApplicationRunner.java @@ -2,6 +2,7 @@ import io.fabric8.kubernetes.client.DefaultKubernetesClient; import io.fabric8.kubernetes.client.KubernetesClient; +import io.javaoperatorsdk.operator.DefaultOperator; import io.javaoperatorsdk.operator.Operator; import io.javaoperatorsdk.operator.config.runtime.DefaultConfigurationService; @@ -9,7 +10,7 @@ public class PureJavaApplicationRunner { public static void main(String[] args) { KubernetesClient client = new DefaultKubernetesClient(); - Operator operator = new Operator(client, DefaultConfigurationService.instance()); + Operator operator = new DefaultOperator(client, DefaultConfigurationService.instance()); operator.registerController(new CustomServiceController(client)); } } diff --git a/samples/quarkus/src/main/java/io/javaoperatorsdk/operator/sample/QuarkusOperator.java b/samples/quarkus/src/main/java/io/javaoperatorsdk/operator/sample/QuarkusOperator.java index c18a8c46f7..d12783aed3 100644 --- a/samples/quarkus/src/main/java/io/javaoperatorsdk/operator/sample/QuarkusOperator.java +++ b/samples/quarkus/src/main/java/io/javaoperatorsdk/operator/sample/QuarkusOperator.java @@ -1,7 +1,7 @@ package io.javaoperatorsdk.operator.sample; import io.fabric8.kubernetes.client.KubernetesClient; -import io.javaoperatorsdk.operator.AbstractOperator; +import io.javaoperatorsdk.operator.DefaultOperator; import io.javaoperatorsdk.operator.api.config.ConfigurationService; import io.quarkus.runtime.Quarkus; import io.quarkus.runtime.QuarkusApplication; @@ -13,7 +13,7 @@ public class QuarkusOperator implements QuarkusApplication { @Inject KubernetesClient client; - @Inject AbstractOperator operator; + @Inject DefaultOperator operator; @Inject ConfigurationService configuration; diff --git a/samples/spring-boot-auto-config/src/main/java/io/javaoperatorsdk/operator/sample/SampleComponent.java b/samples/spring-boot-auto-config/src/main/java/io/javaoperatorsdk/operator/sample/SampleComponent.java index ff846507b3..47f1a32127 100644 --- a/samples/spring-boot-auto-config/src/main/java/io/javaoperatorsdk/operator/sample/SampleComponent.java +++ b/samples/spring-boot-auto-config/src/main/java/io/javaoperatorsdk/operator/sample/SampleComponent.java @@ -1,21 +1,21 @@ package io.javaoperatorsdk.operator.sample; import io.fabric8.kubernetes.client.KubernetesClient; -import io.javaoperatorsdk.operator.Operator; +import io.javaoperatorsdk.operator.DefaultOperator; import org.springframework.stereotype.Component; /** This component just showcases what beans are registered. */ @Component public class SampleComponent { - private final Operator operator; + private final DefaultOperator operator; private final KubernetesClient kubernetesClient; private final CustomServiceController customServiceController; public SampleComponent( - Operator operator, + DefaultOperator operator, KubernetesClient kubernetesClient, CustomServiceController customServiceController) { this.operator = operator; diff --git a/samples/spring-boot-plain/src/main/java/io/javaoperatorsdk/operator/sample/Config.java b/samples/spring-boot-plain/src/main/java/io/javaoperatorsdk/operator/sample/Config.java index 239fb64816..2f54de2d10 100644 --- a/samples/spring-boot-plain/src/main/java/io/javaoperatorsdk/operator/sample/Config.java +++ b/samples/spring-boot-plain/src/main/java/io/javaoperatorsdk/operator/sample/Config.java @@ -2,7 +2,7 @@ import io.fabric8.kubernetes.client.DefaultKubernetesClient; import io.fabric8.kubernetes.client.KubernetesClient; -import io.javaoperatorsdk.operator.Operator; +import io.javaoperatorsdk.operator.DefaultOperator; import io.javaoperatorsdk.operator.api.ResourceController; import io.javaoperatorsdk.operator.config.runtime.DefaultConfigurationService; import java.util.List; @@ -24,8 +24,8 @@ public CustomServiceController customServiceController(KubernetesClient client) // Register all controller beans @Bean - public Operator operator(KubernetesClient client, List controllers) { - Operator operator = new Operator(client, DefaultConfigurationService.instance()); + public DefaultOperator operator(KubernetesClient client, List controllers) { + DefaultOperator operator = new DefaultOperator(client, DefaultConfigurationService.instance()); controllers.forEach(c -> operator.registerControllerForAllNamespaces(c)); return operator; } diff --git a/samples/tomcat/src/main/java/io/javaoperatorsdk/operator/sample/TomcatOperator.java b/samples/tomcat/src/main/java/io/javaoperatorsdk/operator/sample/TomcatOperator.java index 579c7fed7e..d1e3541fae 100644 --- a/samples/tomcat/src/main/java/io/javaoperatorsdk/operator/sample/TomcatOperator.java +++ b/samples/tomcat/src/main/java/io/javaoperatorsdk/operator/sample/TomcatOperator.java @@ -4,6 +4,7 @@ import io.fabric8.kubernetes.client.ConfigBuilder; import io.fabric8.kubernetes.client.DefaultKubernetesClient; import io.fabric8.kubernetes.client.KubernetesClient; +import io.javaoperatorsdk.operator.DefaultOperator; import io.javaoperatorsdk.operator.Operator; import io.javaoperatorsdk.operator.config.runtime.DefaultConfigurationService; import java.io.IOException; @@ -22,7 +23,7 @@ public static void main(String[] args) throws IOException { Config config = new ConfigBuilder().withNamespace(null).build(); KubernetesClient client = new DefaultKubernetesClient(config); - Operator operator = new Operator(client, DefaultConfigurationService.instance()); + Operator operator = new DefaultOperator(client, DefaultConfigurationService.instance()); TomcatController tomcatController = new TomcatController(client); operator.registerControllerForAllNamespaces(tomcatController); diff --git a/samples/webserver/src/main/java/io/javaoperatorsdk/operator/sample/WebServerOperator.java b/samples/webserver/src/main/java/io/javaoperatorsdk/operator/sample/WebServerOperator.java index db06f88e6a..cece2d03a5 100644 --- a/samples/webserver/src/main/java/io/javaoperatorsdk/operator/sample/WebServerOperator.java +++ b/samples/webserver/src/main/java/io/javaoperatorsdk/operator/sample/WebServerOperator.java @@ -4,6 +4,7 @@ import io.fabric8.kubernetes.client.ConfigBuilder; import io.fabric8.kubernetes.client.DefaultKubernetesClient; import io.fabric8.kubernetes.client.KubernetesClient; +import io.javaoperatorsdk.operator.DefaultOperator; import io.javaoperatorsdk.operator.Operator; import io.javaoperatorsdk.operator.config.runtime.DefaultConfigurationService; import java.io.IOException; @@ -23,7 +24,7 @@ public static void main(String[] args) throws IOException { Config config = new ConfigBuilder().withNamespace(null).build(); KubernetesClient client = new DefaultKubernetesClient(config); - Operator operator = new Operator(client, DefaultConfigurationService.instance()); + Operator operator = new DefaultOperator(client, DefaultConfigurationService.instance()); operator.registerControllerForAllNamespaces(new WebServerController(client)); new FtBasic(new TkFork(new FkRegex("/health", "ALL GOOD!")), 8080).start(Exit.NEVER); From eed99d6e0d93276b30f13e2f505444307e14d14c Mon Sep 17 00:00:00 2001 From: soroosh Date: Fri, 18 Dec 2020 14:30:48 +0100 Subject: [PATCH 3/8] fix type in test --- .../operator/IntegrationTestSupport.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/IntegrationTestSupport.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/IntegrationTestSupport.java index 1281e2db9b..c1c018a7ef 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/IntegrationTestSupport.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/IntegrationTestSupport.java @@ -33,10 +33,10 @@ public class IntegrationTestSupport { private static final Logger log = LoggerFactory.getLogger(IntegrationTestSupport.class); private KubernetesClient k8sClient; private MixedOperation< - CustomResource, - CustomResourceList, - CustomResourceDoneable, - Resource> + CustomResource, + CustomResourceList, + CustomResourceDoneable, + Resource> crOperations; private Operator operator; private ResourceController controller; @@ -177,11 +177,11 @@ public KubernetesClient getK8sClient() { } public MixedOperation< - CustomResource, - CustomResourceList, - CustomResourceDoneable, - Resource> - getCrOperations() { + CustomResource, + CustomResourceList, + CustomResourceDoneable, + Resource> + getCrOperations() { return crOperations; } @@ -189,7 +189,7 @@ public CustomResource getCustomResource(String name) { return getCrOperations().inNamespace(TEST_NAMESPACE).withName(name).get(); } - public DefaultOperator getOperator() { + public Operator getOperator() { return operator; } From 85e4d24af0ff39ad8226b04aaedd5a78ffeb2ff4 Mon Sep 17 00:00:00 2001 From: soroosh Date: Fri, 18 Dec 2020 14:31:06 +0100 Subject: [PATCH 4/8] fix type in test --- .../operator/IntegrationTestSupport.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/IntegrationTestSupport.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/IntegrationTestSupport.java index c1c018a7ef..e356a67ec7 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/IntegrationTestSupport.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/IntegrationTestSupport.java @@ -33,10 +33,10 @@ public class IntegrationTestSupport { private static final Logger log = LoggerFactory.getLogger(IntegrationTestSupport.class); private KubernetesClient k8sClient; private MixedOperation< - CustomResource, - CustomResourceList, - CustomResourceDoneable, - Resource> + CustomResource, + CustomResourceList, + CustomResourceDoneable, + Resource> crOperations; private Operator operator; private ResourceController controller; @@ -177,11 +177,11 @@ public KubernetesClient getK8sClient() { } public MixedOperation< - CustomResource, - CustomResourceList, - CustomResourceDoneable, - Resource> - getCrOperations() { + CustomResource, + CustomResourceList, + CustomResourceDoneable, + Resource> + getCrOperations() { return crOperations; } From 9641f8dc771f261699cfa471324fddc52db55684 Mon Sep 17 00:00:00 2001 From: soroosh Date: Fri, 18 Dec 2020 16:17:46 +0100 Subject: [PATCH 5/8] inject Operator rather than AbstractOperator --- .../io/javaoperatorsdk/operator/sample/QuarkusOperator.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/quarkus/src/main/java/io/javaoperatorsdk/operator/sample/QuarkusOperator.java b/samples/quarkus/src/main/java/io/javaoperatorsdk/operator/sample/QuarkusOperator.java index d12783aed3..7b1553d6b5 100644 --- a/samples/quarkus/src/main/java/io/javaoperatorsdk/operator/sample/QuarkusOperator.java +++ b/samples/quarkus/src/main/java/io/javaoperatorsdk/operator/sample/QuarkusOperator.java @@ -1,7 +1,7 @@ package io.javaoperatorsdk.operator.sample; import io.fabric8.kubernetes.client.KubernetesClient; -import io.javaoperatorsdk.operator.DefaultOperator; +import io.javaoperatorsdk.operator.Operator; import io.javaoperatorsdk.operator.api.config.ConfigurationService; import io.quarkus.runtime.Quarkus; import io.quarkus.runtime.QuarkusApplication; @@ -13,7 +13,7 @@ public class QuarkusOperator implements QuarkusApplication { @Inject KubernetesClient client; - @Inject DefaultOperator operator; + @Inject Operator operator; @Inject ConfigurationService configuration; From bd6fa5f1213c6be192605a88a1ccce97391f8dcb Mon Sep 17 00:00:00 2001 From: soroosh Date: Fri, 18 Dec 2020 16:19:39 +0100 Subject: [PATCH 6/8] rename to StandaloneOperator --- .../springboot/starter/OperatorAutoConfiguration.java | 8 ++++---- .../{DefaultOperator.java => StandaloneOperator.java} | 4 ++-- .../javaoperatorsdk/operator/IntegrationTestSupport.java | 2 +- .../operator/sample/MySQLSchemaOperator.java | 4 ++-- .../operator/sample/PureJavaApplicationRunner.java | 4 ++-- .../javaoperatorsdk/operator/sample/SampleComponent.java | 6 +++--- .../java/io/javaoperatorsdk/operator/sample/Config.java | 6 +++--- .../javaoperatorsdk/operator/sample/TomcatOperator.java | 4 ++-- .../operator/sample/WebServerOperator.java | 4 ++-- 9 files changed, 21 insertions(+), 21 deletions(-) rename operator-framework/src/main/java/io/javaoperatorsdk/operator/{DefaultOperator.java => StandaloneOperator.java} (56%) diff --git a/operator-framework-spring-boot-starter/src/main/java/io/javaoperatorsdk/operator/springboot/starter/OperatorAutoConfiguration.java b/operator-framework-spring-boot-starter/src/main/java/io/javaoperatorsdk/operator/springboot/starter/OperatorAutoConfiguration.java index 541a1f703c..be4e6013e9 100644 --- a/operator-framework-spring-boot-starter/src/main/java/io/javaoperatorsdk/operator/springboot/starter/OperatorAutoConfiguration.java +++ b/operator-framework-spring-boot-starter/src/main/java/io/javaoperatorsdk/operator/springboot/starter/OperatorAutoConfiguration.java @@ -6,7 +6,7 @@ import io.fabric8.kubernetes.client.DefaultKubernetesClient; import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.openshift.client.DefaultOpenShiftClient; -import io.javaoperatorsdk.operator.DefaultOperator; +import io.javaoperatorsdk.operator.StandaloneOperator; import io.javaoperatorsdk.operator.api.ResourceController; import io.javaoperatorsdk.operator.api.config.ConfigurationService; import io.javaoperatorsdk.operator.api.config.ControllerConfiguration; @@ -53,10 +53,10 @@ public Config getClientConfiguration() { } @Bean - @ConditionalOnMissingBean(DefaultOperator.class) - public DefaultOperator operator( + @ConditionalOnMissingBean(StandaloneOperator.class) + public StandaloneOperator operator( KubernetesClient kubernetesClient, List resourceControllers) { - final var operator = new DefaultOperator(kubernetesClient, this); + final var operator = new StandaloneOperator(kubernetesClient, this); resourceControllers.forEach(r -> operator.register(processController(r))); return operator; } diff --git a/operator-framework/src/main/java/io/javaoperatorsdk/operator/DefaultOperator.java b/operator-framework/src/main/java/io/javaoperatorsdk/operator/StandaloneOperator.java similarity index 56% rename from operator-framework/src/main/java/io/javaoperatorsdk/operator/DefaultOperator.java rename to operator-framework/src/main/java/io/javaoperatorsdk/operator/StandaloneOperator.java index a0373fc61a..e6b716390b 100644 --- a/operator-framework/src/main/java/io/javaoperatorsdk/operator/DefaultOperator.java +++ b/operator-framework/src/main/java/io/javaoperatorsdk/operator/StandaloneOperator.java @@ -3,8 +3,8 @@ import io.fabric8.kubernetes.client.KubernetesClient; import io.javaoperatorsdk.operator.api.config.ConfigurationService; -public class DefaultOperator extends AbstractOperator { - public DefaultOperator(KubernetesClient k8sClient, ConfigurationService configurationService) { +public class StandaloneOperator extends AbstractOperator { + public StandaloneOperator(KubernetesClient k8sClient, ConfigurationService configurationService) { super(k8sClient, configurationService); } } diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/IntegrationTestSupport.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/IntegrationTestSupport.java index e356a67ec7..f5ced20948 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/IntegrationTestSupport.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/IntegrationTestSupport.java @@ -71,7 +71,7 @@ public void initialize( .withMetadata(new ObjectMetaBuilder().withName(TEST_NAMESPACE).build()) .build()); } - operator = new DefaultOperator(k8sClient, configurationService); + operator = new StandaloneOperator(k8sClient, configurationService); operator.registerController(controller, retry, TEST_NAMESPACE); log.info("Operator is running with {}", controller.getClass().getCanonicalName()); } diff --git a/samples/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/MySQLSchemaOperator.java b/samples/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/MySQLSchemaOperator.java index 6e2d0e08a8..e17893f42e 100644 --- a/samples/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/MySQLSchemaOperator.java +++ b/samples/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/MySQLSchemaOperator.java @@ -4,7 +4,7 @@ import io.fabric8.kubernetes.client.ConfigBuilder; import io.fabric8.kubernetes.client.DefaultKubernetesClient; import io.fabric8.kubernetes.client.KubernetesClient; -import io.javaoperatorsdk.operator.DefaultOperator; +import io.javaoperatorsdk.operator.StandaloneOperator; import io.javaoperatorsdk.operator.Operator; import io.javaoperatorsdk.operator.config.runtime.DefaultConfigurationService; import java.io.IOException; @@ -24,7 +24,7 @@ public static void main(String[] args) throws IOException { Config config = new ConfigBuilder().withNamespace(null).build(); KubernetesClient client = new DefaultKubernetesClient(config); - Operator operator = new DefaultOperator(client, DefaultConfigurationService.instance()); + Operator operator = new StandaloneOperator(client, DefaultConfigurationService.instance()); operator.registerControllerForAllNamespaces(new SchemaController(client)); new FtBasic(new TkFork(new FkRegex("/health", "ALL GOOD!")), 8080).start(Exit.NEVER); diff --git a/samples/pure-java/src/main/java/io/javaoperatorsdk/operator/sample/PureJavaApplicationRunner.java b/samples/pure-java/src/main/java/io/javaoperatorsdk/operator/sample/PureJavaApplicationRunner.java index 2d4cc1c4cd..38b1b141b0 100644 --- a/samples/pure-java/src/main/java/io/javaoperatorsdk/operator/sample/PureJavaApplicationRunner.java +++ b/samples/pure-java/src/main/java/io/javaoperatorsdk/operator/sample/PureJavaApplicationRunner.java @@ -2,7 +2,7 @@ import io.fabric8.kubernetes.client.DefaultKubernetesClient; import io.fabric8.kubernetes.client.KubernetesClient; -import io.javaoperatorsdk.operator.DefaultOperator; +import io.javaoperatorsdk.operator.StandaloneOperator; import io.javaoperatorsdk.operator.Operator; import io.javaoperatorsdk.operator.config.runtime.DefaultConfigurationService; @@ -10,7 +10,7 @@ public class PureJavaApplicationRunner { public static void main(String[] args) { KubernetesClient client = new DefaultKubernetesClient(); - Operator operator = new DefaultOperator(client, DefaultConfigurationService.instance()); + Operator operator = new StandaloneOperator(client, DefaultConfigurationService.instance()); operator.registerController(new CustomServiceController(client)); } } diff --git a/samples/spring-boot-auto-config/src/main/java/io/javaoperatorsdk/operator/sample/SampleComponent.java b/samples/spring-boot-auto-config/src/main/java/io/javaoperatorsdk/operator/sample/SampleComponent.java index 47f1a32127..e7ee16ba5b 100644 --- a/samples/spring-boot-auto-config/src/main/java/io/javaoperatorsdk/operator/sample/SampleComponent.java +++ b/samples/spring-boot-auto-config/src/main/java/io/javaoperatorsdk/operator/sample/SampleComponent.java @@ -1,21 +1,21 @@ package io.javaoperatorsdk.operator.sample; import io.fabric8.kubernetes.client.KubernetesClient; -import io.javaoperatorsdk.operator.DefaultOperator; +import io.javaoperatorsdk.operator.StandaloneOperator; import org.springframework.stereotype.Component; /** This component just showcases what beans are registered. */ @Component public class SampleComponent { - private final DefaultOperator operator; + private final StandaloneOperator operator; private final KubernetesClient kubernetesClient; private final CustomServiceController customServiceController; public SampleComponent( - DefaultOperator operator, + StandaloneOperator operator, KubernetesClient kubernetesClient, CustomServiceController customServiceController) { this.operator = operator; diff --git a/samples/spring-boot-plain/src/main/java/io/javaoperatorsdk/operator/sample/Config.java b/samples/spring-boot-plain/src/main/java/io/javaoperatorsdk/operator/sample/Config.java index 2f54de2d10..0562c82760 100644 --- a/samples/spring-boot-plain/src/main/java/io/javaoperatorsdk/operator/sample/Config.java +++ b/samples/spring-boot-plain/src/main/java/io/javaoperatorsdk/operator/sample/Config.java @@ -2,7 +2,7 @@ import io.fabric8.kubernetes.client.DefaultKubernetesClient; import io.fabric8.kubernetes.client.KubernetesClient; -import io.javaoperatorsdk.operator.DefaultOperator; +import io.javaoperatorsdk.operator.StandaloneOperator; import io.javaoperatorsdk.operator.api.ResourceController; import io.javaoperatorsdk.operator.config.runtime.DefaultConfigurationService; import java.util.List; @@ -24,8 +24,8 @@ public CustomServiceController customServiceController(KubernetesClient client) // Register all controller beans @Bean - public DefaultOperator operator(KubernetesClient client, List controllers) { - DefaultOperator operator = new DefaultOperator(client, DefaultConfigurationService.instance()); + public StandaloneOperator operator(KubernetesClient client, List controllers) { + StandaloneOperator operator = new StandaloneOperator(client, DefaultConfigurationService.instance()); controllers.forEach(c -> operator.registerControllerForAllNamespaces(c)); return operator; } diff --git a/samples/tomcat/src/main/java/io/javaoperatorsdk/operator/sample/TomcatOperator.java b/samples/tomcat/src/main/java/io/javaoperatorsdk/operator/sample/TomcatOperator.java index d1e3541fae..c42f09505c 100644 --- a/samples/tomcat/src/main/java/io/javaoperatorsdk/operator/sample/TomcatOperator.java +++ b/samples/tomcat/src/main/java/io/javaoperatorsdk/operator/sample/TomcatOperator.java @@ -4,7 +4,7 @@ import io.fabric8.kubernetes.client.ConfigBuilder; import io.fabric8.kubernetes.client.DefaultKubernetesClient; import io.fabric8.kubernetes.client.KubernetesClient; -import io.javaoperatorsdk.operator.DefaultOperator; +import io.javaoperatorsdk.operator.StandaloneOperator; import io.javaoperatorsdk.operator.Operator; import io.javaoperatorsdk.operator.config.runtime.DefaultConfigurationService; import java.io.IOException; @@ -23,7 +23,7 @@ public static void main(String[] args) throws IOException { Config config = new ConfigBuilder().withNamespace(null).build(); KubernetesClient client = new DefaultKubernetesClient(config); - Operator operator = new DefaultOperator(client, DefaultConfigurationService.instance()); + Operator operator = new StandaloneOperator(client, DefaultConfigurationService.instance()); TomcatController tomcatController = new TomcatController(client); operator.registerControllerForAllNamespaces(tomcatController); diff --git a/samples/webserver/src/main/java/io/javaoperatorsdk/operator/sample/WebServerOperator.java b/samples/webserver/src/main/java/io/javaoperatorsdk/operator/sample/WebServerOperator.java index cece2d03a5..053d322b2c 100644 --- a/samples/webserver/src/main/java/io/javaoperatorsdk/operator/sample/WebServerOperator.java +++ b/samples/webserver/src/main/java/io/javaoperatorsdk/operator/sample/WebServerOperator.java @@ -4,7 +4,7 @@ import io.fabric8.kubernetes.client.ConfigBuilder; import io.fabric8.kubernetes.client.DefaultKubernetesClient; import io.fabric8.kubernetes.client.KubernetesClient; -import io.javaoperatorsdk.operator.DefaultOperator; +import io.javaoperatorsdk.operator.StandaloneOperator; import io.javaoperatorsdk.operator.Operator; import io.javaoperatorsdk.operator.config.runtime.DefaultConfigurationService; import java.io.IOException; @@ -24,7 +24,7 @@ public static void main(String[] args) throws IOException { Config config = new ConfigBuilder().withNamespace(null).build(); KubernetesClient client = new DefaultKubernetesClient(config); - Operator operator = new DefaultOperator(client, DefaultConfigurationService.instance()); + Operator operator = new StandaloneOperator(client, DefaultConfigurationService.instance()); operator.registerControllerForAllNamespaces(new WebServerController(client)); new FtBasic(new TkFork(new FkRegex("/health", "ALL GOOD!")), 8080).start(Exit.NEVER); From 2a39d0ca8f641389e6437d1b996a2fccf6690830 Mon Sep 17 00:00:00 2001 From: soroosh Date: Fri, 18 Dec 2020 16:22:31 +0100 Subject: [PATCH 7/8] rename to StandaloneOperator --- .../operator/sample/MySQLSchemaOperator.java | 2 +- .../operator/sample/PureJavaApplicationRunner.java | 2 +- .../java/io/javaoperatorsdk/operator/sample/Config.java | 6 ++++-- .../io/javaoperatorsdk/operator/sample/TomcatOperator.java | 2 +- .../javaoperatorsdk/operator/sample/WebServerOperator.java | 2 +- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/samples/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/MySQLSchemaOperator.java b/samples/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/MySQLSchemaOperator.java index e17893f42e..c5ca0e9f70 100644 --- a/samples/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/MySQLSchemaOperator.java +++ b/samples/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/MySQLSchemaOperator.java @@ -4,8 +4,8 @@ import io.fabric8.kubernetes.client.ConfigBuilder; import io.fabric8.kubernetes.client.DefaultKubernetesClient; import io.fabric8.kubernetes.client.KubernetesClient; -import io.javaoperatorsdk.operator.StandaloneOperator; import io.javaoperatorsdk.operator.Operator; +import io.javaoperatorsdk.operator.StandaloneOperator; import io.javaoperatorsdk.operator.config.runtime.DefaultConfigurationService; import java.io.IOException; import org.slf4j.Logger; diff --git a/samples/pure-java/src/main/java/io/javaoperatorsdk/operator/sample/PureJavaApplicationRunner.java b/samples/pure-java/src/main/java/io/javaoperatorsdk/operator/sample/PureJavaApplicationRunner.java index 38b1b141b0..a3813c3fba 100644 --- a/samples/pure-java/src/main/java/io/javaoperatorsdk/operator/sample/PureJavaApplicationRunner.java +++ b/samples/pure-java/src/main/java/io/javaoperatorsdk/operator/sample/PureJavaApplicationRunner.java @@ -2,8 +2,8 @@ import io.fabric8.kubernetes.client.DefaultKubernetesClient; import io.fabric8.kubernetes.client.KubernetesClient; -import io.javaoperatorsdk.operator.StandaloneOperator; import io.javaoperatorsdk.operator.Operator; +import io.javaoperatorsdk.operator.StandaloneOperator; import io.javaoperatorsdk.operator.config.runtime.DefaultConfigurationService; public class PureJavaApplicationRunner { diff --git a/samples/spring-boot-plain/src/main/java/io/javaoperatorsdk/operator/sample/Config.java b/samples/spring-boot-plain/src/main/java/io/javaoperatorsdk/operator/sample/Config.java index 0562c82760..7868401bb0 100644 --- a/samples/spring-boot-plain/src/main/java/io/javaoperatorsdk/operator/sample/Config.java +++ b/samples/spring-boot-plain/src/main/java/io/javaoperatorsdk/operator/sample/Config.java @@ -24,8 +24,10 @@ public CustomServiceController customServiceController(KubernetesClient client) // Register all controller beans @Bean - public StandaloneOperator operator(KubernetesClient client, List controllers) { - StandaloneOperator operator = new StandaloneOperator(client, DefaultConfigurationService.instance()); + public StandaloneOperator operator( + KubernetesClient client, List controllers) { + StandaloneOperator operator = + new StandaloneOperator(client, DefaultConfigurationService.instance()); controllers.forEach(c -> operator.registerControllerForAllNamespaces(c)); return operator; } diff --git a/samples/tomcat/src/main/java/io/javaoperatorsdk/operator/sample/TomcatOperator.java b/samples/tomcat/src/main/java/io/javaoperatorsdk/operator/sample/TomcatOperator.java index c42f09505c..914e0be88a 100644 --- a/samples/tomcat/src/main/java/io/javaoperatorsdk/operator/sample/TomcatOperator.java +++ b/samples/tomcat/src/main/java/io/javaoperatorsdk/operator/sample/TomcatOperator.java @@ -4,8 +4,8 @@ import io.fabric8.kubernetes.client.ConfigBuilder; import io.fabric8.kubernetes.client.DefaultKubernetesClient; import io.fabric8.kubernetes.client.KubernetesClient; -import io.javaoperatorsdk.operator.StandaloneOperator; import io.javaoperatorsdk.operator.Operator; +import io.javaoperatorsdk.operator.StandaloneOperator; import io.javaoperatorsdk.operator.config.runtime.DefaultConfigurationService; import java.io.IOException; import org.slf4j.Logger; diff --git a/samples/webserver/src/main/java/io/javaoperatorsdk/operator/sample/WebServerOperator.java b/samples/webserver/src/main/java/io/javaoperatorsdk/operator/sample/WebServerOperator.java index 053d322b2c..46d8374042 100644 --- a/samples/webserver/src/main/java/io/javaoperatorsdk/operator/sample/WebServerOperator.java +++ b/samples/webserver/src/main/java/io/javaoperatorsdk/operator/sample/WebServerOperator.java @@ -4,8 +4,8 @@ import io.fabric8.kubernetes.client.ConfigBuilder; import io.fabric8.kubernetes.client.DefaultKubernetesClient; import io.fabric8.kubernetes.client.KubernetesClient; -import io.javaoperatorsdk.operator.StandaloneOperator; import io.javaoperatorsdk.operator.Operator; +import io.javaoperatorsdk.operator.StandaloneOperator; import io.javaoperatorsdk.operator.config.runtime.DefaultConfigurationService; import java.io.IOException; import org.slf4j.Logger; From b67a08fb182332c9ba06b4ad989c7327aa3377ac Mon Sep 17 00:00:00 2001 From: soroosh Date: Fri, 18 Dec 2020 16:25:22 +0100 Subject: [PATCH 8/8] update readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 557e9f670b..eb9bd56b62 100644 --- a/README.md +++ b/README.md @@ -69,7 +69,7 @@ Main method initializing the Operator and registering a controller. public class Runner { public static void main(String[] args) { - Operator operator = new DefaultOperator(new DefaultKubernetesClient()); + Operator operator = new StandaloneOperator(new DefaultKubernetesClient()); operator.register(new WebServerController()); } }