Merge branch 'master' into spring-boot-test-module

Author: s-soroosh

operator-framework-core/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>io.javaoperatorsdk</groupId>
         <artifactId>java-operator-sdk</artifactId>
-        <version>1.5.1-SNAPSHOT</version>
+        <version>1.6.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

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

@@ -6,7 +6,7 @@
     <parent>
         <groupId>io.javaoperatorsdk</groupId>
         <artifactId>operator-framework-quarkus-extension-parent</artifactId>
-        <version>1.5.1-SNAPSHOT</version>
+        <version>1.6.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

operator-framework-quarkus-extension/deployment/src/main/java/io/javaoperatorsdk/quarkus/extension/deployment/QuarkusExtensionProcessor.java

@@ -1,5 +1,6 @@
 package io.javaoperatorsdk.quarkus.extension.deployment;
 
+import io.fabric8.kubernetes.client.CustomResource;
 import io.fabric8.kubernetes.client.CustomResourceDoneable;
 import io.javaoperatorsdk.operator.ControllerUtils;
 import io.javaoperatorsdk.operator.api.Controller;
@@ -107,20 +108,26 @@ private ControllerConfiguration createControllerConfiguration(
     final var crDoneableClassName = CustomResourceDoneable.class.getName();
     try (ClassCreator cc =
         ClassCreator.builder()
+            .signature(
+                String.format(
+                    "Lio/fabric8/kubernetes/client/CustomResourceDoneable<L%s;>;",
+                    crType.replace('.', '/')))
             .classOutput(classOutput)
             .className(doneableClassName)
             .superClass(crDoneableClassName)
             .build()) {
 
-      MethodCreator ctor = cc.getMethodCreator("<init>", void.class.getName(), crType);
+      final var functionName = io.fabric8.kubernetes.api.builder.Function.class.getName();
+      MethodCreator ctor =
+          cc.getMethodCreator("<init>", void.class.getName(), crType, functionName);
       ctor.setModifiers(Modifier.PUBLIC);
-      final var functionName = Function.class.getName();
       ctor.invokeSpecialMethod(
-          MethodDescriptor.ofConstructor(crDoneableClassName, crType, functionName),
+          MethodDescriptor.ofConstructor(
+              crDoneableClassName, CustomResource.class.getName(), functionName),
           ctor.getThis(),
           ctor.getMethodParam(0),
-          ctor.invokeStaticMethod(
-              MethodDescriptor.ofMethod(functionName, "identity", functionName)));
+          ctor.getMethodParam(1));
+      ctor.returnValue(null);
     }
 
     // generate configuration

operator-framework-quarkus-extension/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.javaoperatorsdk</groupId>
     <artifactId>java-operator-sdk</artifactId>
-    <version>1.5.1-SNAPSHOT</version>
+    <version>1.6.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

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

@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.javaoperatorsdk</groupId>
     <artifactId>operator-framework-quarkus-extension-parent</artifactId>
-    <version>1.5.1-SNAPSHOT</version>
+    <version>1.6.2-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

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

@@ -6,7 +6,7 @@
     <parent>
         <groupId>io.javaoperatorsdk</groupId>
         <artifactId>java-operator-sdk</artifactId>
-        <version>1.5.1-SNAPSHOT</version>
+        <version>1.6.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>operator-framework-spring-boot-starter</artifactId>

operator-framework/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <artifactId>java-operator-sdk</artifactId>
     <groupId>io.javaoperatorsdk</groupId>
-    <version>1.5.1-SNAPSHOT</version>
+    <version>1.6.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>io.javaoperatorsdk</groupId>
     <artifactId>java-operator-sdk</artifactId>
-    <version>1.5.1-SNAPSHOT</version>
+    <version>1.6.2-SNAPSHOT</version>
     <name>Operator SDK for Java</name>
     <description>Java SDK for implementing Kubernetes operators</description>
     <packaging>pom</packaging>

samples/common/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>io.javaoperatorsdk</groupId>
         <artifactId>java-operator-sdk-samples</artifactId>
-        <version>1.5.1-SNAPSHOT</version>
+        <version>1.6.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>operator-framework-samples-common</artifactId>

samples/mysql-schema/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>io.javaoperatorsdk</groupId>
         <artifactId>java-operator-sdk-samples</artifactId>
-        <version>1.5.1-SNAPSHOT</version>
+        <version>1.6.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>mysql-schema-sample</artifactId>