wip: Bump kubernetes-client-bom from 5.12.2 to 6.0.0

Signed-off-by: Marc Nuri <marc@marcnuri.com>
quarkusio · Jul 11, 2022 · 1b75a41 · 1b75a41
1 parent b01ec42
commit 1b75a41
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/bom/application/pom.xml b/bom/application/pom.xml
@@ -151,7 +151,7 @@
         <kotlin.version>1.6.21</kotlin.version>
         <kotlin.coroutine.version>1.6.3</kotlin.coroutine.version>
         <kotlin-serialization.version>1.3.3</kotlin-serialization.version>
-        <kubernetes-client.version>5.12.2</kubernetes-client.version> <!-- Please check with Java Operator SDK team before updating -->
+        <kubernetes-client.version>6.0.0-RC1</kubernetes-client.version> <!-- Please check with Java Operator SDK team before updating -->
         <dekorate.version>2.11.0</dekorate.version> <!-- Please check with Java Operator SDK team before updating -->
         <maven-invoker.version>3.2.0</maven-invoker.version>
         <awaitility.version>4.2.0</awaitility.version>

diff --git a/test-framework/kubernetes-client/pom.xml b/test-framework/kubernetes-client/pom.xml
@@ -19,7 +19,7 @@
         </dependency>
         <dependency>
             <groupId>io.fabric8</groupId>
-            <artifactId>kubernetes-server-mock</artifactId>
+            <artifactId>kubernetes-client-api</artifactId>
             <exclusions>
                 <exclusion>
                     <groupId>javax.annotation</groupId>
@@ -38,11 +38,15 @@
                     <artifactId>jakarta.xml.bind-api</artifactId>
                 </exclusion>
                 <exclusion>
-                  <groupId>io.sundr</groupId>
-                  <artifactId>*</artifactId>
+                    <groupId>io.sundr</groupId>
+                    <artifactId>*</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>io.fabric8</groupId>
+            <artifactId>kubernetes-server-mock</artifactId>
+        </dependency>
         <dependency>
             <groupId>jakarta.annotation</groupId>
             <artifactId>jakarta.annotation-api</artifactId>

diff --git a/...lient/src/main/java/io/quarkus/test/kubernetes/client/AbstractKubernetesTestResource.java b/...lient/src/main/java/io/quarkus/test/kubernetes/client/AbstractKubernetesTestResource.java
@@ -5,7 +5,6 @@
 import java.util.Map;
 
 import io.fabric8.kubernetes.client.Config;
-import io.fabric8.kubernetes.client.GenericKubernetesClient;
 import io.fabric8.kubernetes.client.KubernetesClient;
 import io.quarkus.test.common.QuarkusTestResourceLifecycleManager;
 
@@ -26,7 +25,7 @@ public Map<String, String> start() {
         server = createServer();
         initServer();
 
-        try (GenericKubernetesClient<?> client = getClient()) {
+        try (C client = getClient()) {
             systemProps.put(Config.KUBERNETES_MASTER_SYSTEM_PROPERTY, client.getConfiguration().getMasterUrl());
         }
 
@@ -40,7 +39,7 @@ public Map<String, String> start() {
         return systemProps;
     }
 
-    protected abstract GenericKubernetesClient<C> getClient();
+    protected abstract C getClient();
 
     /**
      * Can be used by subclasses in order to

diff --git a/...ent/src/main/java/io/quarkus/test/kubernetes/client/KubernetesMockServerTestResource.java b/...ent/src/main/java/io/quarkus/test/kubernetes/client/KubernetesMockServerTestResource.java
@@ -2,7 +2,6 @@
 
 import java.lang.annotation.Annotation;
 
-import io.fabric8.kubernetes.client.GenericKubernetesClient;
 import io.fabric8.kubernetes.client.NamespacedKubernetesClient;
 import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;
 
@@ -14,7 +13,7 @@ public class KubernetesMockServerTestResource
         extends AbstractKubernetesTestResource<KubernetesMockServer, NamespacedKubernetesClient> {
 
     @Override
-    protected GenericKubernetesClient<NamespacedKubernetesClient> getClient() {
+    protected NamespacedKubernetesClient getClient() {
         return server.createClient();
     }
 

diff --git a/...-client/src/main/java/io/quarkus/test/kubernetes/client/KubernetesServerTestResource.java b/...-client/src/main/java/io/quarkus/test/kubernetes/client/KubernetesServerTestResource.java
@@ -6,7 +6,6 @@
 import java.util.Collections;
 import java.util.function.Consumer;
 
-import io.fabric8.kubernetes.client.GenericKubernetesClient;
 import io.fabric8.kubernetes.client.NamespacedKubernetesClient;
 import io.fabric8.kubernetes.client.server.mock.KubernetesServer;
 import io.quarkus.test.common.QuarkusTestResourceConfigurableLifecycleManager;
@@ -32,7 +31,7 @@ public void init(WithKubernetesTestServer annotation) {
     }
 
     @Override
-    protected GenericKubernetesClient<NamespacedKubernetesClient> getClient() {
+    protected NamespacedKubernetesClient getClient() {
         return server.getClient();
     }
 

diff --git a/...t-client/src/main/java/io/quarkus/test/kubernetes/client/OpenShiftServerTestResource.java b/...t-client/src/main/java/io/quarkus/test/kubernetes/client/OpenShiftServerTestResource.java
@@ -3,7 +3,6 @@
 import java.lang.annotation.Annotation;
 import java.util.function.Consumer;
 
-import io.fabric8.kubernetes.client.GenericKubernetesClient;
 import io.fabric8.openshift.client.NamespacedOpenShiftClient;
 import io.fabric8.openshift.client.server.mock.OpenShiftServer;
 import io.quarkus.test.common.QuarkusTestResourceConfigurableLifecycleManager;
@@ -27,7 +26,7 @@ public void init(WithOpenShiftTestServer annotation) {
     }
 
     @Override
-    protected GenericKubernetesClient<NamespacedOpenShiftClient> getClient() {
+    protected NamespacedOpenShiftClient getClient() {
         return server.getOpenshiftClient();
     }