Merge pull request #1 from java-operator-sdk/master

update fork

Author: stoetti

README.md

@@ -204,3 +204,28 @@ public class Application {
     }
 }
 ```
+
+#### Spring Boot test support
+
+Adding the following dependency would let you mock the operator for the 
+tests where loading the spring container is necessary, 
+but it doesn't need real access to a Kubernetes cluster.
+
+```xml
+<dependency>
+ <groupId>io.javaoperatorsdk</groupId>
+ <artifactId>operator-framework-spring-boot-starter-test</artifactId>
+ <version>{see https://search.maven.org/search?q=a:operator-framework-spring-boot-starter for latest version}</version>
+</dependency>
+``` 
+
+Mock the operator:
+```java
+@SpringBootTest
+@EnableMockOperator
+public class SpringBootStarterSampleApplicationTest {
+
+  @Test
+  void contextLoads() {}
+}
+```

operator-framework-quarkus-extension/deployment/pom.xml

@@ -31,6 +31,18 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-kubernetes-client-deployment</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-kubernetes-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-container-image-jib-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-health-deployment</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

operator-framework-quarkus-extension/pom.xml

@@ -19,7 +19,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <maven.compiler.parameters>true</maven.compiler.parameters>
-    <quarkus.version>1.10.3.Final</quarkus.version>
+    <quarkus.version>1.10.5.Final</quarkus.version>
     <compiler-plugin.version>3.8.1</compiler-plugin.version>
     <maven.surefire.version>3.0.0-M5</maven.surefire.version>
   </properties>

operator-framework-quarkus-extension/runtime/pom.xml

@@ -32,6 +32,18 @@
       <groupId>io.quarkus</groupId>
       <artifactId>quarkus-kubernetes-client</artifactId>
     </dependency>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-kubernetes</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-container-image-jib</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-smallrye-health</artifactId>
+    </dependency>
   </dependencies>
 
   <build>

operator-framework-spring-boot-starter-test/pom.xml

@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>io.javaoperatorsdk</groupId>
+  <artifactId>operator-framework-spring-boot-starter-test</artifactId>
+
+  <parent>
+    <groupId>io.javaoperatorsdk</groupId>
+    <artifactId>java-operator-sdk</artifactId>
+    <version>1.6.2-SNAPSHOT</version>
+  </parent>
+
+  <properties>
+    <java.version>11</java.version>
+    <maven.compiler.source>11</maven.compiler.source>
+    <maven.compiler.target>11</maven.compiler.target>
+  </properties>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-dependencies</artifactId>
+        <version>2.3.4.RELEASE</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
+  <dependencies>
+    <dependency>
+      <groupId>io.fabric8</groupId>
+      <artifactId>kubernetes-server-mock</artifactId>
+      <version>4.12.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.javaoperatorsdk</groupId>
+      <artifactId>operator-framework</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>io.fabric8</groupId>
+      <artifactId>kubernetes-server-mock</artifactId>
+      <version>4.12.0</version>
+    </dependency>
+  </dependencies>
+</project>

operator-framework-spring-boot-starter-test/src/main/java/io/javaoperatorsdk/operator/springboot/starter/test/EnableMockOperator.java

@@ -0,0 +1,9 @@
+package io.javaoperatorsdk.operator.springboot.starter.test;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import org.springframework.context.annotation.Import;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Import(TestConfiguration.class)
+public @interface EnableMockOperator {}

operator-framework-spring-boot-starter-test/src/main/java/io/javaoperatorsdk/operator/springboot/starter/test/TestConfiguration.java

@@ -0,0 +1,63 @@
+package io.javaoperatorsdk.operator.springboot.starter.test;
+
+import io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinition;
+import io.fabric8.kubernetes.client.KubernetesClient;
+import io.fabric8.kubernetes.client.server.mock.KubernetesCrudDispatcher;
+import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;
+import io.fabric8.kubernetes.client.utils.Serialization;
+import io.fabric8.mockwebserver.Context;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import okhttp3.mockwebserver.MockWebServer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.util.ResourceUtils;
+
+@Configuration
+public class TestConfiguration {
+
+  private static final Logger log = LoggerFactory.getLogger(TestConfiguration.class);
+
+  @Value("${io.javaoperatorsdk.test.crdPaths}")
+  private List<String> crdPaths;
+
+  @Bean
+  public KubernetesMockServer k8sMockServer() {
+    final var server =
+        new KubernetesMockServer(
+            new Context(),
+            new MockWebServer(),
+            new HashMap<>(),
+            new KubernetesCrudDispatcher(Collections.emptyList()),
+            true);
+    server.init();
+    return server;
+  }
+
+  @Bean
+  public KubernetesClient kubernetesClient(KubernetesMockServer server) {
+    final var client = server.createClient();
+
+    crdPaths.forEach(
+        crdPath -> {
+          CustomResourceDefinition crd = null;
+          try {
+            crd = Serialization.unmarshal(new FileInputStream(ResourceUtils.getFile(crdPath)));
+          } catch (FileNotFoundException e) {
+            log.warn("CRD with path {} not found!", crdPath);
+            e.printStackTrace();
+            return;
+          }
+
+          client.apiextensions().v1().customResourceDefinitions().create(crd);
+        });
+
+    return client;
+  }
+}

pom.xml

@@ -45,6 +45,7 @@
         <module>operator-framework</module>
         <module>operator-framework-quarkus-extension</module>
         <module>operator-framework-spring-boot-starter</module>
+        <module>operator-framework-spring-boot-starter-test</module>
         <module>samples</module>
     </modules>
 

samples/quarkus/pom.xml

@@ -17,7 +17,7 @@
   <properties>
     <maven.compiler.source>11</maven.compiler.source>
     <maven.compiler.target>11</maven.compiler.target>
-    <quarkus.version>1.10.3.Final</quarkus.version>
+    <quarkus.version>1.10.5.Final</quarkus.version>
     <compiler-plugin.version>3.8.1</compiler-plugin.version>
     <maven.compiler.parameters>true</maven.compiler.parameters>
   </properties>
@@ -45,10 +45,6 @@
       <artifactId>operator-framework-samples-common</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-core</artifactId>
-    </dependency>
   </dependencies>
 
   <build>

samples/quarkus/src/main/java/io/javaoperatorsdk/operator/sample/QuarkusOperator.java

@@ -17,13 +17,15 @@ public class QuarkusOperator implements QuarkusApplication {
 
   @Inject ConfigurationService configuration;
 
+  @Inject CustomServiceController controller;
+
   public static void main(String... args) {
     Quarkus.run(QuarkusOperator.class, args);
   }
 
   @Override
   public int run(String... args) throws Exception {
-    final var config = configuration.getConfigurationFor(new CustomServiceController(client));
+    final var config = configuration.getConfigurationFor(controller);
     System.out.println("CR class: " + config.getCustomResourceClass());
     System.out.println("Doneable class = " + config.getDoneableClass());
     Quarkus.waitForExit();