Skip to content

Commit 7fb1666

Browse files
committed
chore: update to Quarkus 1.12.0 and fabric8 kubernetes-client 5.1.0
1 parent efa569e commit 7fb1666

File tree

5 files changed

+31
-6
lines changed

5 files changed

+31
-6
lines changed

operator-framework-quarkus-extension/pom.xml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2020
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
2121
<maven.compiler.parameters>true</maven.compiler.parameters>
22-
<quarkus.version>1.11.3.Final</quarkus.version>
22+
<quarkus.version>1.12.0.Final</quarkus.version>
2323
<compiler-plugin.version>3.8.1</compiler-plugin.version>
2424
<maven.surefire.version>3.0.0-M5</maven.surefire.version>
2525
</properties>
@@ -31,6 +31,13 @@
3131
</modules>
3232
<dependencyManagement>
3333
<dependencies>
34+
<dependency>
35+
<groupId>io.fabric8</groupId>
36+
<artifactId>kubernetes-client-bom</artifactId>
37+
<version>${fabric8-client.version}</version>
38+
<type>pom</type>
39+
<scope>import</scope>
40+
</dependency>
3441
<dependency>
3542
<groupId>io.quarkus</groupId>
3643
<artifactId>quarkus-bom</artifactId>

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,16 @@ void testCrdLoaded() {
2323
assertThat(applicationContext.getBean(Operator.class)).isNotNull();
2424
assertThat(
2525
client
26+
.apiextensions()
27+
.v1()
2628
.customResourceDefinitions()
2729
.withName("customservices.sample.javaoperatorsdk")
2830
.get())
2931
.isNotNull();
3032
assertThat(
3133
client
34+
.apiextensions()
35+
.v1()
3236
.customResourceDefinitions()
3337
.withName("customservices.global.sample.javaoperatorsdk")
3438
.get())

operator-framework/src/test/java/io/javaoperatorsdk/operator/IntegrationTestSupport.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import io.fabric8.kubernetes.api.model.Namespace;
88
import io.fabric8.kubernetes.api.model.NamespaceBuilder;
99
import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
10-
import io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinition;
10+
import io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinition;
1111
import io.fabric8.kubernetes.client.CustomResource;
1212
import io.fabric8.kubernetes.client.KubernetesClient;
1313
import io.fabric8.kubernetes.client.dsl.MixedOperation;
@@ -72,7 +72,7 @@ public void initialize(
7272

7373
public CustomResourceDefinition loadCRDAndApplyToCluster(String classPathYaml) {
7474
CustomResourceDefinition crd = loadYaml(CustomResourceDefinition.class, classPathYaml);
75-
k8sClient.customResourceDefinitions().createOrReplace(crd);
75+
k8sClient.apiextensions().v1().customResourceDefinitions().createOrReplace(crd);
7676
return crd;
7777
}
7878

pom.xml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<junit.version>5.7.0</junit.version>
3939
<surefire.version>3.0.0-M5</surefire.version>
4040
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
41-
<fabric8-client.version>5.0.0</fabric8-client.version>
41+
<fabric8-client.version>5.1.0</fabric8-client.version>
4242
<slf4j.version>1.7.30</slf4j.version>
4343
</properties>
4444

@@ -56,9 +56,16 @@
5656
<dependencies>
5757
<dependency>
5858
<groupId>io.fabric8</groupId>
59-
<artifactId>openshift-client</artifactId>
59+
<artifactId>kubernetes-client-bom</artifactId>
6060
<version>${fabric8-client.version}</version>
61+
<type>pom</type>
62+
<scope>import</scope>
6163
</dependency>
64+
<!--<dependency>
65+
<groupId>io.fabric8</groupId>
66+
<artifactId>openshift-client</artifactId>
67+
<version>${fabric8-client.version}</version>
68+
</dependency>-->
6269
<dependency>
6370
<groupId>org.slf4j</groupId>
6471
<artifactId>slf4j-api</artifactId>

samples/quarkus/pom.xml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,20 @@
1717
<properties>
1818
<maven.compiler.source>11</maven.compiler.source>
1919
<maven.compiler.target>11</maven.compiler.target>
20-
<quarkus.version>1.11.3.Final</quarkus.version>
20+
<quarkus.version>1.12.0.Final</quarkus.version>
2121
<compiler-plugin.version>3.8.1</compiler-plugin.version>
2222
<maven.compiler.parameters>true</maven.compiler.parameters>
2323
</properties>
2424

2525
<dependencyManagement>
2626
<dependencies>
27+
<dependency>
28+
<groupId>io.fabric8</groupId>
29+
<artifactId>kubernetes-client-bom</artifactId>
30+
<version>${fabric8-client.version}</version>
31+
<type>pom</type>
32+
<scope>import</scope>
33+
</dependency>
2734
<dependency>
2835
<groupId>io.quarkus</groupId>
2936
<artifactId>quarkus-bom</artifactId>

0 commit comments

Comments
 (0)