diff --git a/pom.xml b/pom.xml index 734619a536..083cbd7944 100644 --- a/pom.xml +++ b/pom.xml @@ -79,7 +79,6 @@ operator-framework-core operator-framework-junit5 operator-framework - smoke-test-samples micrometer-support sample-operators diff --git a/smoke-test-samples/README.md b/smoke-test-samples/README.md deleted file mode 100644 index 12daaa70f6..0000000000 --- a/smoke-test-samples/README.md +++ /dev/null @@ -1,4 +0,0 @@ -This samples folder contains simple artificial samples used for testing the framework rather than -showing off its real-world usage. - -More realistic samples can be found in the `sample-operators` directory. diff --git a/smoke-test-samples/common/crd/test_object.yaml b/smoke-test-samples/common/crd/test_object.yaml deleted file mode 100644 index d897b550ef..0000000000 --- a/smoke-test-samples/common/crd/test_object.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: "sample.javaoperatorsdk/v1" -kind: CustomService -metadata: - name: custom-service1 -spec: - name: testservice1 - label: testlabel diff --git a/smoke-test-samples/common/pom.xml b/smoke-test-samples/common/pom.xml deleted file mode 100644 index b3ef85aaef..0000000000 --- a/smoke-test-samples/common/pom.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - 4.0.0 - - - io.javaoperatorsdk - java-operator-sdk-smoke-test-samples - 3.2.0-SNAPSHOT - - - operator-framework-smoke-test-samples-common - Operator SDK - Smoke Test Samples - Common Files - Files shared between some of the samples - jar - - - - io.javaoperatorsdk - operator-framework - compile - - - io.fabric8 - crd-generator-apt - compile - - - io.fabric8 - crd-generator-api - - - org.apache.logging.log4j - log4j-slf4j-impl - - - org.apache.logging.log4j - log4j-core - - - - diff --git a/smoke-test-samples/common/src/main/java/io/javaoperatorsdk/operator/sample/CustomService.java b/smoke-test-samples/common/src/main/java/io/javaoperatorsdk/operator/sample/CustomService.java deleted file mode 100644 index d67c7e6955..0000000000 --- a/smoke-test-samples/common/src/main/java/io/javaoperatorsdk/operator/sample/CustomService.java +++ /dev/null @@ -1,13 +0,0 @@ -package io.javaoperatorsdk.operator.sample; - -import io.fabric8.kubernetes.api.model.Namespaced; -import io.fabric8.kubernetes.client.CustomResource; -import io.fabric8.kubernetes.model.annotation.Group; -import io.fabric8.kubernetes.model.annotation.ShortNames; -import io.fabric8.kubernetes.model.annotation.Version; - -@Group("sample.javaoperatorsdk") -@Version("v1") -@ShortNames("cs") -public class CustomService extends CustomResource implements Namespaced { -} diff --git a/smoke-test-samples/common/src/main/java/io/javaoperatorsdk/operator/sample/CustomServiceReconciler.java b/smoke-test-samples/common/src/main/java/io/javaoperatorsdk/operator/sample/CustomServiceReconciler.java deleted file mode 100644 index 9a5e188cba..0000000000 --- a/smoke-test-samples/common/src/main/java/io/javaoperatorsdk/operator/sample/CustomServiceReconciler.java +++ /dev/null @@ -1,58 +0,0 @@ -package io.javaoperatorsdk.operator.sample; - -import java.util.Collections; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import io.fabric8.kubernetes.api.model.ServiceBuilder; -import io.fabric8.kubernetes.api.model.ServicePort; -import io.fabric8.kubernetes.api.model.ServiceSpec; -import io.fabric8.kubernetes.client.DefaultKubernetesClient; -import io.fabric8.kubernetes.client.KubernetesClient; -import io.javaoperatorsdk.operator.api.reconciler.*; -import io.javaoperatorsdk.operator.api.reconciler.ControllerConfiguration; - -/** A very simple sample controller that creates a service with a label. */ -@ControllerConfiguration -public class CustomServiceReconciler implements Reconciler { - - private static final Logger log = LoggerFactory.getLogger(CustomServiceReconciler.class); - - private final KubernetesClient kubernetesClient; - - public CustomServiceReconciler() { - this(new DefaultKubernetesClient()); - } - - public CustomServiceReconciler(KubernetesClient kubernetesClient) { - this.kubernetesClient = kubernetesClient; - } - - @Override - public UpdateControl reconcile( - CustomService resource, Context context) { - log.info("Reconciling: {}", resource.getMetadata().getName()); - - ServicePort servicePort = new ServicePort(); - servicePort.setPort(8080); - ServiceSpec serviceSpec = new ServiceSpec(); - serviceSpec.setPorts(Collections.singletonList(servicePort)); - - var service = new ServiceBuilder() - .withNewMetadata() - .withName(resource.getSpec().getName()) - .addToLabels("testLabel", resource.getSpec().getLabel()) - .endMetadata() - .withSpec(serviceSpec) - .build(); - service.addOwnerReference(resource); - - kubernetesClient - .services() - .inNamespace(resource.getMetadata().getNamespace()) - .createOrReplace(service); - - return UpdateControl.updateResource(resource); - } -} diff --git a/smoke-test-samples/common/src/main/java/io/javaoperatorsdk/operator/sample/ServiceSpec.java b/smoke-test-samples/common/src/main/java/io/javaoperatorsdk/operator/sample/ServiceSpec.java deleted file mode 100644 index f4a3452b35..0000000000 --- a/smoke-test-samples/common/src/main/java/io/javaoperatorsdk/operator/sample/ServiceSpec.java +++ /dev/null @@ -1,23 +0,0 @@ -package io.javaoperatorsdk.operator.sample; - -public class ServiceSpec { - - private String name; - private String label; - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getLabel() { - return label; - } - - public void setLabel(String label) { - this.label = label; - } -} diff --git a/smoke-test-samples/common/src/main/resources/log4j2.xml b/smoke-test-samples/common/src/main/resources/log4j2.xml deleted file mode 100644 index d6869ee67c..0000000000 --- a/smoke-test-samples/common/src/main/resources/log4j2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/smoke-test-samples/pom.xml b/smoke-test-samples/pom.xml deleted file mode 100644 index 3dcb634986..0000000000 --- a/smoke-test-samples/pom.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - 4.0.0 - - - io.javaoperatorsdk - java-operator-sdk - 3.2.0-SNAPSHOT - - - java-operator-sdk-smoke-test-samples - Operator SDK - Smoke Test Samples - Samples to manually smoke the sdk - pom - - - common - pure-java - spring-boot-plain - - - - - - org.apache.maven.plugins - maven-deploy-plugin - ${maven-deploy-plugin.version} - - true - - - - - - diff --git a/smoke-test-samples/pure-java/pom.xml b/smoke-test-samples/pure-java/pom.xml deleted file mode 100644 index dc08082522..0000000000 --- a/smoke-test-samples/pure-java/pom.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - 4.0.0 - - - io.javaoperatorsdk - java-operator-sdk-smoke-test-samples - 3.2.0-SNAPSHOT - - - operator-framework-smoke-test-samples-pure-java - Operator SDK - Smoke Test Samples - Pure Java - Sample usage with pure java app - jar - - - - io.javaoperatorsdk - operator-framework-smoke-test-samples-common - ${project.version} - - - - diff --git a/smoke-test-samples/pure-java/src/main/java/io/javaoperatorsdk/operator/sample/PureJavaApplicationRunner.java b/smoke-test-samples/pure-java/src/main/java/io/javaoperatorsdk/operator/sample/PureJavaApplicationRunner.java deleted file mode 100644 index 0a3b59d290..0000000000 --- a/smoke-test-samples/pure-java/src/main/java/io/javaoperatorsdk/operator/sample/PureJavaApplicationRunner.java +++ /dev/null @@ -1,16 +0,0 @@ -package io.javaoperatorsdk.operator.sample; - -import java.util.concurrent.Executors; - -import io.javaoperatorsdk.operator.Operator; - -public class PureJavaApplicationRunner { - - public static void main(String[] args) { - Operator operator = - new Operator(overrider -> overrider.withExecutorService(Executors.newCachedThreadPool()) - .withConcurrentReconciliationThreads(2)); - operator.register(new CustomServiceReconciler()); - operator.start(); - } -} diff --git a/smoke-test-samples/spring-boot-plain/pom.xml b/smoke-test-samples/spring-boot-plain/pom.xml deleted file mode 100644 index 08dcfb76f2..0000000000 --- a/smoke-test-samples/spring-boot-plain/pom.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - 4.0.0 - - - io.javaoperatorsdk - java-operator-sdk-smoke-test-samples - 3.2.0-SNAPSHOT - - - operator-framework-smoke-test-samples-spring-boot - Operator SDK - Smoke Test Samples - Spring Boot - Sample usage with Spring Boot - jar - - - - io.javaoperatorsdk - operator-framework-smoke-test-samples-common - ${project.version} - - - org.springframework.boot - spring-boot-starter-log4j2 - - - org.springframework.boot - spring-boot-starter - - - org.springframework.boot - spring-boot-starter-logging - - - - - org.springframework.boot - spring-boot-starter-test - test - - - junit - junit - - - - - org.apache.logging.log4j - log4j-api - ${log4j.version} - - - - - - - org.springframework.boot - spring-boot-dependencies - ${spring-boot.version} - pom - import - - - - - - - - org.springframework.boot - spring-boot-maven-plugin - ${spring-boot.version} - - - - diff --git a/smoke-test-samples/spring-boot-plain/src/main/java/io/javaoperatorsdk/operator/sample/Config.java b/smoke-test-samples/spring-boot-plain/src/main/java/io/javaoperatorsdk/operator/sample/Config.java deleted file mode 100644 index 7eed511d18..0000000000 --- a/smoke-test-samples/spring-boot-plain/src/main/java/io/javaoperatorsdk/operator/sample/Config.java +++ /dev/null @@ -1,27 +0,0 @@ -package io.javaoperatorsdk.operator.sample; - -import java.util.List; - -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -import io.javaoperatorsdk.operator.Operator; -import io.javaoperatorsdk.operator.api.reconciler.Reconciler; - -@Configuration -public class Config { - - @Bean - public CustomServiceReconciler customServiceController() { - return new CustomServiceReconciler(); - } - - // Register all controller beans - @Bean(initMethod = "start", destroyMethod = "stop") - @SuppressWarnings("rawtypes") - public Operator operator(List controllers) { - Operator operator = new Operator(); - controllers.forEach(operator::register); - return operator; - } -} diff --git a/smoke-test-samples/spring-boot-plain/src/main/java/io/javaoperatorsdk/operator/sample/SpringBootStarterSampleApplication.java b/smoke-test-samples/spring-boot-plain/src/main/java/io/javaoperatorsdk/operator/sample/SpringBootStarterSampleApplication.java deleted file mode 100644 index 97533f858a..0000000000 --- a/smoke-test-samples/spring-boot-plain/src/main/java/io/javaoperatorsdk/operator/sample/SpringBootStarterSampleApplication.java +++ /dev/null @@ -1,12 +0,0 @@ -package io.javaoperatorsdk.operator.sample; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -@SpringBootApplication -public class SpringBootStarterSampleApplication { - - public static void main(String[] args) { - SpringApplication.run(SpringBootStarterSampleApplication.class, args); - } -} diff --git a/smoke-test-samples/spring-boot-plain/src/main/resources/application.yaml b/smoke-test-samples/spring-boot-plain/src/main/resources/application.yaml deleted file mode 100644 index e5ed78803c..0000000000 --- a/smoke-test-samples/spring-boot-plain/src/main/resources/application.yaml +++ /dev/null @@ -1,5 +0,0 @@ -javaoperatorsdk: - controllers: - customservicecontroller: - retry: - maxAttempts: 3 \ No newline at end of file