From 941ebf9466606f1297a4beafb4aa084ec73a0cd5 Mon Sep 17 00:00:00 2001
From: Marc Nuri <marc@marcnuri.com>
Date: Thu, 19 Jan 2023 14:59:56 +0100
Subject: [PATCH] deps: Bump kubernetes-client-bom from 6.3.1 to 6.4.0

- Switch to use Vert.x HttpClient implementation

Signed-off-by: Marc Nuri <marc@marcnuri.com>
---
 .../deployment/pom.xml                         |  4 ++++
 .../container-image-s2i/deployment/pom.xml     |  4 ++++
 .../deployment-internal/pom.xml                | 10 ++++++++++
 .../kubernetes-client/runtime-internal/pom.xml | 11 +++++++++++
 extensions/kubernetes-client/runtime/pom.xml   | 10 ++++++++++
 extensions/kubernetes-client/spi/pom.xml       |  8 ++++++++
 .../deployment/pom.xml                         | 18 ++++++++++++++++++
 extensions/kubernetes/kind/deployment/pom.xml  |  4 ++++
 .../kubernetes/openshift/deployment/pom.xml    |  4 ++++
 .../kubernetes/vanilla/deployment/pom.xml      | 12 ++++++++++++
 .../quarkus-banned-dependencies.xml            |  4 +++-
 pom.xml                                        |  2 +-
 test-framework/kubernetes-client/pom.xml       | 10 ++++++++++
 13 files changed, 99 insertions(+), 2 deletions(-)

diff --git a/extensions/container-image/container-image-openshift/deployment/pom.xml b/extensions/container-image/container-image-openshift/deployment/pom.xml
index c101061d05f68..0403d9e816c39 100644
--- a/extensions/container-image/container-image-openshift/deployment/pom.xml
+++ b/extensions/container-image/container-image-openshift/deployment/pom.xml
@@ -55,6 +55,10 @@
                     <groupId>com.sun</groupId>
                     <artifactId>tools</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>io.fabric8</groupId>
+                    <artifactId>kubernetes-client</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
 
diff --git a/extensions/container-image/container-image-s2i/deployment/pom.xml b/extensions/container-image/container-image-s2i/deployment/pom.xml
index e717ba19077b3..70621164b7f18 100644
--- a/extensions/container-image/container-image-s2i/deployment/pom.xml
+++ b/extensions/container-image/container-image-s2i/deployment/pom.xml
@@ -51,6 +51,10 @@
                     <groupId>com.sun</groupId>
                     <artifactId>tools</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>io.fabric8</groupId>
+                    <artifactId>kubernetes-client</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
 
diff --git a/extensions/kubernetes-client/deployment-internal/pom.xml b/extensions/kubernetes-client/deployment-internal/pom.xml
index 5f50448a7e887..a564ff686f0c2 100644
--- a/extensions/kubernetes-client/deployment-internal/pom.xml
+++ b/extensions/kubernetes-client/deployment-internal/pom.xml
@@ -33,6 +33,16 @@
         <dependency>
             <groupId>io.fabric8</groupId>
             <artifactId>kubernetes-client</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>io.fabric8</groupId>
+                    <artifactId>kubernetes-httpclient-okhttp</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.fabric8</groupId>
+            <artifactId>kubernetes-httpclient-vertx</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
diff --git a/extensions/kubernetes-client/runtime-internal/pom.xml b/extensions/kubernetes-client/runtime-internal/pom.xml
index 9a99ba4a8f9aa..2b01e9e2ab69f 100644
--- a/extensions/kubernetes-client/runtime-internal/pom.xml
+++ b/extensions/kubernetes-client/runtime-internal/pom.xml
@@ -23,6 +23,17 @@
             <groupId>io.fabric8</groupId>
             <artifactId>kubernetes-client</artifactId>
             <scope>provided</scope> <!-- we don't want this ending up on the runtime classpath -->
+            <exclusions>
+                <exclusion>
+                    <groupId>io.fabric8</groupId>
+                    <artifactId>kubernetes-httpclient-okhttp</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.fabric8</groupId>
+            <artifactId>kubernetes-httpclient-vertx</artifactId>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 
diff --git a/extensions/kubernetes-client/runtime/pom.xml b/extensions/kubernetes-client/runtime/pom.xml
index 044e3100e236d..7445df9dc8dd2 100644
--- a/extensions/kubernetes-client/runtime/pom.xml
+++ b/extensions/kubernetes-client/runtime/pom.xml
@@ -29,6 +29,16 @@
         <dependency>
             <groupId>io.fabric8</groupId>
             <artifactId>kubernetes-client</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>io.fabric8</groupId>
+                    <artifactId>kubernetes-httpclient-okhttp</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.fabric8</groupId>
+            <artifactId>kubernetes-httpclient-vertx</artifactId>
         </dependency>
         <dependency>
             <groupId>org.graalvm.nativeimage</groupId>
diff --git a/extensions/kubernetes-client/spi/pom.xml b/extensions/kubernetes-client/spi/pom.xml
index 57ef85a82ecfb..a2d91bf7654e7 100644
--- a/extensions/kubernetes-client/spi/pom.xml
+++ b/extensions/kubernetes-client/spi/pom.xml
@@ -22,6 +22,10 @@
             <groupId>io.fabric8</groupId>
             <artifactId>kubernetes-client</artifactId>
             <exclusions>
+                <exclusion>
+                    <groupId>io.fabric8</groupId>
+                    <artifactId>kubernetes-httpclient-okhttp</artifactId>
+                </exclusion>
                 <exclusion>
                     <groupId>javax.annotation</groupId>
                     <artifactId>javax.annotation-api</artifactId>
@@ -36,6 +40,10 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>io.fabric8</groupId>
+            <artifactId>kubernetes-httpclient-vertx</artifactId>
+        </dependency>
 
     </dependencies>
     <build>
diff --git a/extensions/kubernetes-service-binding/deployment/pom.xml b/extensions/kubernetes-service-binding/deployment/pom.xml
index 067af3efaecd1..b84ad93c366f2 100644
--- a/extensions/kubernetes-service-binding/deployment/pom.xml
+++ b/extensions/kubernetes-service-binding/deployment/pom.xml
@@ -43,8 +43,26 @@
                     <groupId>com.sun</groupId>
                     <artifactId>tools</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>io.fabric8</groupId>
+                    <artifactId>kubernetes-client</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.fabric8</groupId>
+            <artifactId>kubernetes-server-mock</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>io.fabric8</groupId>
+                    <artifactId>kubernetes-httpclient-okhttp</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>io.fabric8</groupId>
+            <artifactId>kubernetes-httpclient-vertx</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/extensions/kubernetes/kind/deployment/pom.xml b/extensions/kubernetes/kind/deployment/pom.xml
index 1046c28165a32..cfbc1ef49ae53 100644
--- a/extensions/kubernetes/kind/deployment/pom.xml
+++ b/extensions/kubernetes/kind/deployment/pom.xml
@@ -34,6 +34,10 @@
                     <groupId>com.sun</groupId>
                     <artifactId>tools</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>io.fabric8</groupId>
+                    <artifactId>kubernetes-client</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
     </dependencies>
diff --git a/extensions/kubernetes/openshift/deployment/pom.xml b/extensions/kubernetes/openshift/deployment/pom.xml
index 98a6583756a03..d4c4f315d6628 100644
--- a/extensions/kubernetes/openshift/deployment/pom.xml
+++ b/extensions/kubernetes/openshift/deployment/pom.xml
@@ -38,6 +38,10 @@
                     <groupId>com.sun</groupId>
                     <artifactId>tools</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>io.fabric8</groupId>
+                    <artifactId>kubernetes-client</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
diff --git a/extensions/kubernetes/vanilla/deployment/pom.xml b/extensions/kubernetes/vanilla/deployment/pom.xml
index 3898ab1f2e153..8c1d9f4b0c8d7 100644
--- a/extensions/kubernetes/vanilla/deployment/pom.xml
+++ b/extensions/kubernetes/vanilla/deployment/pom.xml
@@ -42,6 +42,10 @@
                     <groupId>com.sun</groupId>
                     <artifactId>tools</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>io.fabric8</groupId>
+                    <artifactId>kubernetes-client</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -57,6 +61,10 @@
                     <groupId>com.sun</groupId>
                     <artifactId>tools</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>io.fabric8</groupId>
+                    <artifactId>kubernetes-client</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -72,6 +80,10 @@
                     <groupId>com.sun</groupId>
                     <artifactId>tools</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>io.fabric8</groupId>
+                    <artifactId>kubernetes-client</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
diff --git a/independent-projects/enforcer-rules/src/main/resources/enforcer-rules/quarkus-banned-dependencies.xml b/independent-projects/enforcer-rules/src/main/resources/enforcer-rules/quarkus-banned-dependencies.xml
index 30f9458575ccd..0e95dae390b0c 100644
--- a/independent-projects/enforcer-rules/src/main/resources/enforcer-rules/quarkus-banned-dependencies.xml
+++ b/independent-projects/enforcer-rules/src/main/resources/enforcer-rules/quarkus-banned-dependencies.xml
@@ -102,6 +102,8 @@
                 <exclude>org.javassist:javassist</exclude>
                 <!-- Jandex moved to SmallRye -->
                 <exclude>org.jboss:jandex</exclude>
+                <!-- Ensure Fabric8 Kubernetes Client won't propagate its OkHttp implementation -->
+                <exclude>io.fabric8:kubernetes-httpclient-okhttp</exclude>
             </excludes>
             <includes>
                 <!-- this is for REST Assured -->
@@ -109,4 +111,4 @@
             </includes>
         </bannedDependencies>
     </rules>
-</enforcer>
\ No newline at end of file
+</enforcer>
diff --git a/pom.xml b/pom.xml
index 03362de3a98fc..fbff7cdfc26e7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,7 +68,7 @@
 
         <!-- Dependency versions -->
         <jacoco.version>0.8.8</jacoco.version>
-        <kubernetes-client.version>6.3.1</kubernetes-client.version> <!-- Please check with Java Operator SDK team before updating -->
+        <kubernetes-client.version>6.4.0</kubernetes-client.version> <!-- Please check with Java Operator SDK team before updating -->
 
         <!-- Make sure to check compatibility between these 2 gRPC components before upgrade -->
         <grpc.version>1.52.1</grpc.version> <!-- when updating, verify if com.google.auth should not be updated too -->
diff --git a/test-framework/kubernetes-client/pom.xml b/test-framework/kubernetes-client/pom.xml
index 257f3eb1438d0..ad83c16dba30f 100644
--- a/test-framework/kubernetes-client/pom.xml
+++ b/test-framework/kubernetes-client/pom.xml
@@ -46,6 +46,16 @@
         <dependency>
             <groupId>io.fabric8</groupId>
             <artifactId>kubernetes-server-mock</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>io.fabric8</groupId>
+                    <artifactId>kubernetes-httpclient-okhttp</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.fabric8</groupId>
+            <artifactId>kubernetes-httpclient-vertx</artifactId>
         </dependency>
         <dependency>
             <groupId>jakarta.annotation</groupId>