Merge pull request #266 from java-operator-sdk/update-quarkus

feat: update to Quarkus 1.10.5, inject controller in sample

Author: kirek007

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>

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();