Use Kubernetes Java client 9.0.2 (#1898)

rjeberhard · web-flow · commit 8e58dc100df5 · 2020-09-04T10:57:09.000-04:00
* Uptake k8s Java client 9.0.1

* Review corrections

* Use new version of GenericKubernetesApi
diff --git a/new-integration-tests/src/test/java/oracle/weblogic/domain/Domain.java b/new-integration-tests/src/test/java/oracle/weblogic/domain/Domain.java
@@ -3,6 +3,7 @@
 
 package oracle.weblogic.domain;
 
+import io.kubernetes.client.common.KubernetesObject;
 import io.kubernetes.client.openapi.models.V1ObjectMeta;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -13,7 +14,7 @@
 @ApiModel(
     description =
         "Domain represents a WebLogic domain and how it will be realized in the Kubernetes cluster.")
-public class Domain {
+public class Domain implements KubernetesObject {
 
   @ApiModelProperty("The API version for the Domain.")
   private String apiVersion;
diff --git a/new-integration-tests/src/test/java/oracle/weblogic/domain/DomainList.java b/new-integration-tests/src/test/java/oracle/weblogic/domain/DomainList.java
@@ -6,6 +6,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import io.kubernetes.client.common.KubernetesListObject;
 import io.kubernetes.client.openapi.models.V1ListMeta;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -14,7 +15,7 @@
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 @ApiModel(description = "DomainList is a list of Domains.")
-public class DomainList {
+public class DomainList implements KubernetesListObject {
 
   @ApiModelProperty("The API version for the Domain.")
   private String apiVersion;
diff --git a/new-integration-tests/src/test/java/oracle/weblogic/kubernetes/actions/impl/primitive/Kubernetes.java b/new-integration-tests/src/test/java/oracle/weblogic/kubernetes/actions/impl/primitive/Kubernetes.java
@@ -23,9 +23,6 @@
 import com.google.gson.JsonElement;
 import io.kubernetes.client.Copy;
 import io.kubernetes.client.custom.V1Patch;
-import io.kubernetes.client.extended.generic.GenericKubernetesApi;
-import io.kubernetes.client.extended.generic.KubernetesApiResponse;
-import io.kubernetes.client.extended.generic.options.DeleteOptions;
 import io.kubernetes.client.openapi.ApiClient;
 import io.kubernetes.client.openapi.ApiException;
 import io.kubernetes.client.openapi.Configuration;
@@ -77,6 +74,10 @@
 import io.kubernetes.client.openapi.models.V1ServicePort;
 import io.kubernetes.client.util.ClientBuilder;
 import io.kubernetes.client.util.PatchUtils;
+import io.kubernetes.client.util.exception.CopyNotSupportedException;
+import io.kubernetes.client.util.generic.GenericKubernetesApi;
+import io.kubernetes.client.util.generic.KubernetesApiResponse;
+import io.kubernetes.client.util.generic.options.DeleteOptions;
 import oracle.weblogic.domain.Domain;
 import oracle.weblogic.domain.DomainList;
 import oracle.weblogic.kubernetes.logging.LoggingFacade;
@@ -412,6 +413,7 @@ public static String getPodLog(String name, String namespace, String container)
           namespace, // name of the Namespace
           container, // container for which to stream logs
           null, //  Boolean Follow the log stream of the pod
+          null, // skip TLS verification of backend
           null, // number of bytes to read from the server before terminating the log output
           PRETTY, // pretty print output
           null, // Boolean, Return previous terminated container logs
@@ -652,7 +654,7 @@ public static V1PodList listPods(String namespace, String labelSelectors) throws
    * @throws ApiException when pod interaction fails
    */
   public static void copyDirectoryFromPod(V1Pod pod, String srcPath, Path destination)
-      throws IOException, ApiException {
+      throws IOException, ApiException, CopyNotSupportedException {
     Copy copy = new Copy();
     copy.copyDirectoryFromPod(pod, srcPath, destination);
   }
diff --git a/new-integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/BuildApplication.java b/new-integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/BuildApplication.java
@@ -19,6 +19,7 @@
 import io.kubernetes.client.openapi.models.V1PodSpec;
 import io.kubernetes.client.openapi.models.V1Secret;
 import io.kubernetes.client.openapi.models.V1SecretList;
+import io.kubernetes.client.util.exception.CopyNotSupportedException;
 import oracle.weblogic.kubernetes.TestConstants;
 import oracle.weblogic.kubernetes.actions.impl.Exec;
 import oracle.weblogic.kubernetes.actions.impl.primitive.Kubernetes;
@@ -179,7 +180,7 @@ public static Path buildApplication(Path appSrcPath, Map<String, String> antPara
 
       Kubernetes.copyDirectoryFromPod(webLogicPod,
           Paths.get(APPLICATIONS_PATH, archiveDistDir).toString(), destArchiveBaseDir);
-    } catch (ApiException | IOException | InterruptedException ioex) {
+    } catch (ApiException | IOException | InterruptedException | CopyNotSupportedException ioex) {
       logger.info("Exception while copying file " + Paths.get(APPLICATIONS_PATH, archiveDistDir) + " from pod", ioex);
     }
 
diff --git a/new-integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/LoggingUtil.java b/new-integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/LoggingUtil.java
@@ -28,6 +28,7 @@
 import io.kubernetes.client.openapi.models.V1PodSpec;
 import io.kubernetes.client.openapi.models.V1Volume;
 import io.kubernetes.client.openapi.models.V1VolumeMount;
+import io.kubernetes.client.util.exception.CopyNotSupportedException;
 import oracle.weblogic.kubernetes.TestConstants;
 import oracle.weblogic.kubernetes.actions.impl.primitive.Kubernetes;
 import oracle.weblogic.kubernetes.logging.LoggingFacade;
@@ -435,7 +436,7 @@ private static void copyDirectoryFromPod(V1Pod pvPod, Path destinationPath)
         try {
           logger.info("Copying the contents of PV to {0}", destinationPath.toString());
           Kubernetes.copyDirectoryFromPod(pvPod, "/shared", destinationPath);
-        } catch (IOException | ApiException ex) {
+        } catch (IOException | ApiException | CopyNotSupportedException ex) {
           logger.warning(ex.getMessage());
         }
       };
diff --git a/operator/src/main/java/oracle/kubernetes/operator/calls/AsyncRequestStep.java b/operator/src/main/java/oracle/kubernetes/operator/calls/AsyncRequestStep.java
@@ -3,15 +3,14 @@
 
 package oracle.kubernetes.operator.calls;
 
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Random;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import io.kubernetes.client.common.KubernetesListObject;
 import io.kubernetes.client.openapi.ApiCallback;
 import io.kubernetes.client.openapi.ApiClient;
 import io.kubernetes.client.openapi.ApiException;
@@ -95,23 +94,11 @@ public AsyncRequestStep(
   }
 
   private static String accessContinue(Object result) {
-    String cont = "";
-    if (result != null) {
-      try {
-        Method m = result.getClass().getMethod("getMetadata");
-        Object meta = m.invoke(result);
-        if (meta instanceof V1ListMeta) {
-          return ((V1ListMeta) meta).getContinue();
-        }
-      } catch (NoSuchMethodException
-          | SecurityException
-          | IllegalAccessException
-          | IllegalArgumentException
-          | InvocationTargetException e) {
-        // no-op, no-log
-      }
-    }
-    return cont;
+    return Optional.ofNullable(result)
+        .filter(KubernetesListObject.class::isInstance)
+        .map(KubernetesListObject.class::cast)
+        .map(KubernetesListObject::getMetadata)
+        .map(V1ListMeta::getContinue).orElse(null);
   }
 
   @Override
diff --git a/operator/src/main/java/oracle/kubernetes/operator/helpers/CallBuilder.java b/operator/src/main/java/oracle/kubernetes/operator/helpers/CallBuilder.java
@@ -222,6 +222,7 @@ public <T> T execute(
                   null,
                   null,
                   null,
+                  null,
                   pretty,
                   null,
                   null,
@@ -1215,7 +1216,6 @@ private Call deleteCollectionPodAsync(
         .deleteCollectionNamespacedPodAsync(
             namespace,
             pretty,
-            allowWatchBookmarks,
             cont,
             dryRun,
             fieldSelector,
@@ -1226,7 +1226,6 @@ private Call deleteCollectionPodAsync(
             propagationPolicy,
             resourceVersion,
             timeoutSeconds,
-            watch,
             deleteOptions,
             callback);
   }
@@ -1806,6 +1805,7 @@ private Call readPodLogAsync(
       String namespace,
       String container,
       Boolean follow,
+      Boolean insecureSkipTLSVerifyBackend,
       Integer limitBytes,
       String pretty,
       Boolean previous,
@@ -1820,6 +1820,7 @@ private Call readPodLogAsync(
             namespace,
             container,
             follow,
+            insecureSkipTLSVerifyBackend,
             limitBytes,
             pretty,
             previous,
diff --git a/operator/src/main/java/oracle/kubernetes/operator/helpers/ClientPool.java b/operator/src/main/java/oracle/kubernetes/operator/helpers/ClientPool.java
@@ -12,7 +12,6 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
 
-import io.kubernetes.client.custom.V1Patch;
 import io.kubernetes.client.openapi.ApiClient;
 import io.kubernetes.client.openapi.Configuration;
 import io.kubernetes.client.util.ClientBuilder;
@@ -103,7 +102,7 @@ private static class DefaultClientFactory implements ClientFactory {
     public ApiClient get() {
       ApiClient client;
       try {
-        client = ClientBuilder.standard().setOverridePatchFormat(V1Patch.PATCH_FORMAT_JSON_PATCH).build();
+        client = ClientBuilder.standard().build();
         if (first.getAndSet(false)) {
           Configuration.setDefaultApiClient(client);
         }
diff --git a/operator/src/main/java/oracle/kubernetes/weblogic/domain/model/Domain.java b/operator/src/main/java/oracle/kubernetes/weblogic/domain/model/Domain.java
@@ -19,6 +19,7 @@
 import com.google.common.base.Strings;
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
+import io.kubernetes.client.common.KubernetesObject;
 import io.kubernetes.client.openapi.models.V1EnvVar;
 import io.kubernetes.client.openapi.models.V1LocalObjectReference;
 import io.kubernetes.client.openapi.models.V1ObjectMeta;
@@ -37,7 +38,7 @@
 /**
  * Domain represents a WebLogic domain and how it will be realized in the Kubernetes cluster.
  */
-public class Domain {
+public class Domain implements KubernetesObject {
   /**
    * The pattern for computing the default shared logs directory.
    */
diff --git a/operator/src/main/java/oracle/kubernetes/weblogic/domain/model/DomainList.java b/operator/src/main/java/oracle/kubernetes/weblogic/domain/model/DomainList.java
@@ -10,13 +10,14 @@
 
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
+import io.kubernetes.client.common.KubernetesListObject;
 import io.kubernetes.client.openapi.models.V1ListMeta;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /** DomainList is a list of Domains. */
-public class DomainList {
+public class DomainList implements KubernetesListObject {
 
   /**
    * APIVersion defines the versioned schema of this representation of an object. Servers should
diff --git a/pom.xml b/pom.xml
@@ -442,17 +442,6 @@
 
   <dependencyManagement>
     <dependencies>
-      <!-- Add direct bouncycastle dependency to override version from kubernetes/client-java until they update -->
-      <dependency>
-        <groupId>org.bouncycastle</groupId>
-        <artifactId>bcprov-ext-jdk15on</artifactId>
-        <version>1.64</version>
-      </dependency>
-      <dependency>
-        <groupId>org.bouncycastle</groupId>
-        <artifactId>bcpkix-jdk15on</artifactId>
-        <version>1.64</version>
-      </dependency>
       <dependency>
         <groupId>io.kubernetes</groupId>
         <artifactId>client-java</artifactId>
@@ -701,7 +690,7 @@
     <assertj.core.version>3.15.0</assertj.core.version>
     <commons.io.version>2.6</commons.io.version>
     <awaitility-version>4.0.2</awaitility-version>
-    <client-java-version>8.0.2</client-java-version>
+    <client-java-version>9.0.2</client-java-version>
     <junit.jupiter.version>5.6.0</junit.jupiter.version>
     <junit.vintage.version>5.6.0</junit.vintage.version>
     <junit.platform.version>1.6.0</junit.platform.version>
