Bump fabric8 kubernetes-client from 4.1.3 to 4.5.2

* Bump sundrio.version from 0.16.4 to 0.17.2 * Remove KubernetesDeserializer thread safety workaround. * Simplify code used to turn off HTTP/2, utilizing new method in KC 4.4.0 * Remove generic parameter from KubernetesResource (relates to fabric8io/kubernetes-client#1661)
k-wall · Sep 18, 2019 · b026f2c · b026f2c
1 parent 7d32594
commit b026f2c
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 204 deletions.
diff --git a/address-space-controller/pom.xml b/address-space-controller/pom.xml
@@ -142,12 +142,6 @@
                     <exclude>META-INF/*.RSA</exclude>
                   </excludes>
                 </filter>
-                <filter>
-                  <artifact>io.fabric8:kubernetes-model</artifact>
-                  <excludes>
-                    <exclude>io/fabric8/kubernetes/internal/KubernetesDeserializer**</exclude>
-                  </excludes>
-                </filter>
               </filters>
             </configuration>
           </execution>

diff --git a/api-model/pom.xml b/api-model/pom.xml
@@ -49,6 +49,7 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>ch.qos.logback</groupId>

diff --git a/api-model/src/main/java/io/enmasse/common/model/AbstractList.java b/api-model/src/main/java/io/enmasse/common/model/AbstractList.java
@@ -18,7 +18,7 @@
 
 @SuppressWarnings("serial")
 public abstract class AbstractList<T extends HasMetadata> extends AbstractResource<T>
-                implements KubernetesResource<T>, KubernetesResourceList<T> {
+                implements KubernetesResource, KubernetesResourceList<T> {
 
     @Valid
     private ListMeta metadata = new ListMeta();

diff --git a/api-model/src/main/java/io/fabric8/kubernetes/internal/KubernetesDeserializer.java b/api-model/src/main/java/io/fabric8/kubernetes/internal/KubernetesDeserializer.java
diff --git a/api-server/pom.xml b/api-server/pom.xml
@@ -142,12 +142,6 @@
                     <exclude>META-INF/*.RSA</exclude>
                   </excludes>
                 </filter>
-                <filter>
-                  <artifact>io.fabric8:kubernetes-model</artifact>
-                  <excludes>
-                    <exclude>io/fabric8/kubernetes/internal/KubernetesDeserializer**</exclude>
-                  </excludes>
-                </filter>
               </filters>
             </configuration>
           </execution>

diff --git a/pom.xml b/pom.xml
@@ -42,8 +42,8 @@
         <maven.compiler.target>11</maven.compiler.target>
 
         <avro.version>1.9.0</avro.version>
-        <fabric8.kubernetes-client.version>4.1.3</fabric8.kubernetes-client.version>
-        <sundrio.version>0.16.4</sundrio.version>
+        <fabric8.kubernetes-client.version>4.5.2</fabric8.kubernetes-client.version>
+        <sundrio.version>0.17.2</sundrio.version>
         <vertx.version>3.7.1</vertx.version>
         <slf4j.version>1.7.21</slf4j.version>
         <logback.version>1.2.3</logback.version>

diff --git a/service-broker/pom.xml b/service-broker/pom.xml
@@ -148,12 +148,6 @@
                     <exclude>META-INF/*.RSA</exclude>
                   </excludes>
                 </filter>
-                <filter>
-                  <artifact>io.fabric8:kubernetes-model</artifact>
-                  <excludes>
-                    <exclude>io/fabric8/kubernetes/internal/KubernetesDeserializer**</exclude>
-                  </excludes>
-                </filter>
               </filters>
             </configuration>
           </execution>

diff --git a/standard-controller/pom.xml b/standard-controller/pom.xml
@@ -110,14 +110,6 @@
                   <mainClass>io.enmasse.controller.standard.StandardController</mainClass>
                 </transformer>
               </transformers>
-              <filters>
-                  <filter>
-                      <artifact>io.fabric8:kubernetes-model</artifact>
-                      <excludes>
-                          <exclude>io/fabric8/kubernetes/internal/KubernetesDeserializer**</exclude>
-                      </excludes>
-                  </filter>
-              </filters>
             </configuration>
           </execution>
         </executions>

diff --git a/systemtests/src/main/java/io/enmasse/systemtest/platform/Minikube.java b/systemtests/src/main/java/io/enmasse/systemtest/platform/Minikube.java
@@ -10,26 +10,20 @@
 import io.fabric8.kubernetes.client.Config;
 import io.fabric8.kubernetes.client.ConfigBuilder;
 import io.fabric8.kubernetes.client.DefaultKubernetesClient;
-import io.fabric8.kubernetes.client.utils.HttpClientUtils;
-import okhttp3.OkHttpClient;
-import okhttp3.Protocol;
 import org.slf4j.Logger;
 
 import java.util.Arrays;
-import java.util.Collections;
 
 public class Minikube extends Kubernetes {
     private static Logger log = CustomLogger.getLogger();
 
     protected Minikube(String globalNamespace) {
         super(globalNamespace, () -> {
-            Config config = new ConfigBuilder().build();
+            Config config = new ConfigBuilder()
+                    .withHttp2Disable(true) // Workaround https://github.com/square/okhttp/issues/3146
+                    .build();
 
-            OkHttpClient httpClient = HttpClientUtils.createHttpClient(config);
-            // Workaround https://github.com/square/okhttp/issues/3146
-            httpClient = httpClient.newBuilder().protocols(Collections.singletonList(Protocol.HTTP_1_1)).build();
-
-            return new DefaultKubernetesClient(httpClient, config);
+            return new DefaultKubernetesClient(config);
         });
     }
 

diff --git a/systemtests/src/main/java/io/enmasse/systemtest/platform/OpenShift.java b/systemtests/src/main/java/io/enmasse/systemtest/platform/OpenShift.java
@@ -10,17 +10,12 @@
 import io.enmasse.systemtest.utils.TestUtils;
 import io.fabric8.kubernetes.client.Config;
 import io.fabric8.kubernetes.client.ConfigBuilder;
-import io.fabric8.kubernetes.client.utils.HttpClientUtils;
 import io.fabric8.openshift.api.model.Route;
 import io.fabric8.openshift.client.DefaultOpenShiftClient;
 import io.fabric8.openshift.client.OpenShiftClient;
 import io.fabric8.openshift.client.OpenShiftConfig;
-import okhttp3.OkHttpClient;
-import okhttp3.Protocol;
 import org.slf4j.Logger;
 
-import java.util.Collections;
-
 /**
  * Handles interaction with openshift cluster
  */
@@ -34,12 +29,10 @@ public OpenShift(Environment environment, String globalNamespace) {
         super(globalNamespace, () -> {
             Config config = new ConfigBuilder().withMasterUrl(environment.getApiUrl())
                     .withOauthToken(environment.getApiToken())
+                    .withHttp2Disable(true) //  // Workaround https://github.com/square/okhttp/issues/3146
                     .build();
 
-            OkHttpClient httpClient = HttpClientUtils.createHttpClient(config);
-            // Workaround https://github.com/square/okhttp/issues/3146
-            httpClient = httpClient.newBuilder().protocols(Collections.singletonList(Protocol.HTTP_1_1)).build();
-            return new DefaultOpenShiftClient(httpClient, new OpenShiftConfig(config));
+            return new DefaultOpenShiftClient(new OpenShiftConfig(config));
         });
     }