Skip to content

Commit 9265b0c

Browse files
s-sorooshs-soroosh
authored
Merge branch 'master' into spring-boot-test-module
2 parents 8ec8e52 + a4d5507 commit 9265b0c

File tree

17 files changed

+31
-23
lines changed

17 files changed

+31
-23
lines changed

‎operator-framework-core/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>io.javaoperatorsdk</groupId>
88
<artifactId>java-operator-sdk</artifactId>
9-
<version>1.5.1-SNAPSHOT</version>
9+
<version>1.6.2-SNAPSHOT</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>io.javaoperatorsdk</groupId>
88
<artifactId>operator-framework-quarkus-extension-parent</artifactId>
9-
<version>1.5.1-SNAPSHOT</version>
9+
<version>1.6.2-SNAPSHOT</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212

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

+12-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package io.javaoperatorsdk.quarkus.extension.deployment;
22

3+
import io.fabric8.kubernetes.client.CustomResource;
34
import io.fabric8.kubernetes.client.CustomResourceDoneable;
45
import io.javaoperatorsdk.operator.ControllerUtils;
56
import io.javaoperatorsdk.operator.api.Controller;
@@ -107,20 +108,26 @@ private ControllerConfiguration createControllerConfiguration(
107108
final var crDoneableClassName = CustomResourceDoneable.class.getName();
108109
try (ClassCreator cc =
109110
ClassCreator.builder()
111+
.signature(
112+
String.format(
113+
"Lio/fabric8/kubernetes/client/CustomResourceDoneable<L%s;>;",
114+
crType.replace('.', '/')))
110115
.classOutput(classOutput)
111116
.className(doneableClassName)
112117
.superClass(crDoneableClassName)
113118
.build()) {
114119

115-
MethodCreator ctor = cc.getMethodCreator("<init>", void.class.getName(), crType);
120+
final var functionName = io.fabric8.kubernetes.api.builder.Function.class.getName();
121+
MethodCreator ctor =
122+
cc.getMethodCreator("<init>", void.class.getName(), crType, functionName);
116123
ctor.setModifiers(Modifier.PUBLIC);
117-
final var functionName = Function.class.getName();
118124
ctor.invokeSpecialMethod(
119-
MethodDescriptor.ofConstructor(crDoneableClassName, crType, functionName),
125+
MethodDescriptor.ofConstructor(
126+
crDoneableClassName, CustomResource.class.getName(), functionName),
120127
ctor.getThis(),
121128
ctor.getMethodParam(0),
122-
ctor.invokeStaticMethod(
123-
MethodDescriptor.ofMethod(functionName, "identity", functionName)));
129+
ctor.getMethodParam(1));
130+
ctor.returnValue(null);
124131
}
125132

126133
// generate configuration

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>io.javaoperatorsdk</groupId>
77
<artifactId>java-operator-sdk</artifactId>
8-
<version>1.5.1-SNAPSHOT</version>
8+
<version>1.6.2-SNAPSHOT</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>io.javaoperatorsdk</groupId>
88
<artifactId>operator-framework-quarkus-extension-parent</artifactId>
9-
<version>1.5.1-SNAPSHOT</version>
9+
<version>1.6.2-SNAPSHOT</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>io.javaoperatorsdk</groupId>
88
<artifactId>java-operator-sdk</artifactId>
9-
<version>1.5.1-SNAPSHOT</version>
9+
<version>1.6.2-SNAPSHOT</version>
1010
</parent>
1111

1212
<artifactId>operator-framework-spring-boot-starter</artifactId>

‎operator-framework/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>java-operator-sdk</artifactId>
77
<groupId>io.javaoperatorsdk</groupId>
8-
<version>1.5.1-SNAPSHOT</version>
8+
<version>1.6.2-SNAPSHOT</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>io.javaoperatorsdk</groupId>
77
<artifactId>java-operator-sdk</artifactId>
8-
<version>1.5.1-SNAPSHOT</version>
8+
<version>1.6.2-SNAPSHOT</version>
99
<name>Operator SDK for Java</name>
1010
<description>Java SDK for implementing Kubernetes operators</description>
1111
<packaging>pom</packaging>

‎samples/common/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>io.javaoperatorsdk</groupId>
88
<artifactId>java-operator-sdk-samples</artifactId>
9-
<version>1.5.1-SNAPSHOT</version>
9+
<version>1.6.2-SNAPSHOT</version>
1010
</parent>
1111

1212
<artifactId>operator-framework-samples-common</artifactId>

‎samples/mysql-schema/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>io.javaoperatorsdk</groupId>
88
<artifactId>java-operator-sdk-samples</artifactId>
9-
<version>1.5.1-SNAPSHOT</version>
9+
<version>1.6.2-SNAPSHOT</version>
1010
</parent>
1111

1212
<artifactId>mysql-schema-sample</artifactId>

‎samples/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>io.javaoperatorsdk</groupId>
88
<artifactId>java-operator-sdk</artifactId>
9-
<version>1.5.1-SNAPSHOT</version>
9+
<version>1.6.2-SNAPSHOT</version>
1010
</parent>
1111

1212
<artifactId>java-operator-sdk-samples</artifactId>

‎samples/pure-java/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>io.javaoperatorsdk</groupId>
88
<artifactId>java-operator-sdk-samples</artifactId>
9-
<version>1.5.1-SNAPSHOT</version>
9+
<version>1.6.2-SNAPSHOT</version>
1010
</parent>
1111

1212
<artifactId>operator-framework-samples-pure-java</artifactId>

‎samples/quarkus/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>io.javaoperatorsdk</groupId>
77
<artifactId>java-operator-sdk-samples</artifactId>
8-
<version>1.5.1-SNAPSHOT</version>
8+
<version>1.6.2-SNAPSHOT</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎samples/spring-boot-auto-config/pom.xml

+4-3
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<modelVersion>4.0.0</modelVersion>
66

7+
78
<parent>
8-
<groupId>io.javaoperatorsdk</groupId>
9-
<artifactId>java-operator-sdk-samples</artifactId>
10-
<version>1.5.1-SNAPSHOT</version>
9+
<groupId>io.javaoperatorsdk</groupId>
10+
<artifactId>java-operator-sdk-samples</artifactId>
11+
<version>1.6.2-SNAPSHOT</version>
1112
</parent>
1213

1314
<artifactId>operator-framework-samples-spring-boot-auto-configuration</artifactId>

‎samples/spring-boot-plain/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>io.javaoperatorsdk</groupId>
88
<artifactId>java-operator-sdk-samples</artifactId>
9-
<version>1.5.1-SNAPSHOT</version>
9+
<version>1.6.2-SNAPSHOT</version>
1010
</parent>
1111

1212
<artifactId>operator-framework-samples-spring-boot-plain</artifactId>

‎samples/tomcat/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>io.javaoperatorsdk</groupId>
99
<artifactId>java-operator-sdk-samples</artifactId>
10-
<version>1.5.1-SNAPSHOT</version>
10+
<version>1.6.2-SNAPSHOT</version>
1111
</parent>
1212

1313
<artifactId>tomcat-sample</artifactId>

‎samples/webserver/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>io.javaoperatorsdk</groupId>
88
<artifactId>java-operator-sdk-samples</artifactId>
9-
<version>1.5.1-SNAPSHOT</version>
9+
<version>1.6.2-SNAPSHOT</version>
1010
</parent>
1111

1212
<artifactId>webserver-sample</artifactId>

0 commit comments

Comments
 (0)