Merge pull request #354 from oracle/kubernetes-client-2.0

Use kubernetes client 2.0.0

Author: rjeberhard

operator/pom.xml

@@ -3,7 +3,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-  
+
   <parent>
     <groupId>oracle.kubernetes</groupId>
     <artifactId>operator-parent</artifactId>
@@ -269,7 +269,7 @@
         <dependency>
             <groupId>io.kubernetes</groupId>
             <artifactId>client-java</artifactId>
-            <version>1.0.0</version>
+            <version>2.0.0</version>
         </dependency>
         <dependency>
             <groupId>com.appscode.voyager</groupId>
@@ -292,22 +292,22 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
             <version>1.7.25</version>
-        </dependency>      
-          
+        </dependency>
+
         <!--  not included with jdk 9 -->
         <dependency>
             <groupId>javax.xml.bind</groupId>
             <artifactId>jaxb-api</artifactId>
             <version>2.3.0</version>
         </dependency>
-        
+
         <!-- for mvn exec:java -->
         <dependency>
             <groupId>org.yaml</groupId>
             <artifactId>snakeyaml</artifactId>
             <version>1.19</version>
         </dependency>
-        
+
         <!-- test dependencies -->
         <dependency>
             <!-- note: need to include this before junit since junit includes an obsolete version of hamcrest -->

operator/src/main/java/oracle/kubernetes/operator/helpers/CallBuilder.java

@@ -802,27 +802,56 @@ public Step createServiceAsync(
    *
    * @param name Name
    * @param namespace Namespace
+   * @param deleteOptions Delete options
    * @return Status of deletion
    * @throws ApiException API Exception
    */
-  public V1Status deleteService(String name, String namespace) throws ApiException {
+  public V1Status deleteService(String name, String namespace, V1DeleteOptions deleteOptions)
+      throws ApiException {
     ApiClient client = helper.take();
     try {
-      return new CoreV1Api(client).deleteNamespacedService(name, namespace, pretty);
+      return new CoreV1Api(client)
+          .deleteNamespacedService(
+              name,
+              namespace,
+              deleteOptions,
+              pretty,
+              gracePeriodSeconds,
+              orphanDependents,
+              propagationPolicy);
     } finally {
       helper.recycle(client);
     }
   }
 
   private com.squareup.okhttp.Call deleteServiceAsync(
-      ApiClient client, String name, String namespace, ApiCallback<V1Status> callback)
+      ApiClient client,
+      String name,
+      String namespace,
+      V1DeleteOptions deleteOptions,
+      ApiCallback<V1Status> callback)
       throws ApiException {
-    return new CoreV1Api(client).deleteNamespacedServiceAsync(name, namespace, pretty, callback);
+    return new CoreV1Api(client)
+        .deleteNamespacedServiceAsync(
+            name,
+            namespace,
+            deleteOptions,
+            pretty,
+            gracePeriodSeconds,
+            orphanDependents,
+            propagationPolicy,
+            callback);
   }
 
   private final CallFactory<V1Status> DELETE_SERVICE =
       (requestParams, usage, cont, callback) ->
-          wrap(deleteServiceAsync(usage, requestParams.name, requestParams.namespace, callback));
+          wrap(
+              deleteServiceAsync(
+                  usage,
+                  requestParams.name,
+                  requestParams.namespace,
+                  (V1DeleteOptions) requestParams.body,
+                  callback));
 
   /**
    * Asynchronous step for deleting service

operator/src/test/java/oracle/kubernetes/operator/utils/KubernetesArtifactUtils.java

@@ -12,6 +12,7 @@
 import com.appscode.voyager.client.models.V1beta1IngressSpec;
 import io.kubernetes.client.custom.IntOrString;
 import io.kubernetes.client.custom.Quantity;
+import io.kubernetes.client.models.ApiregistrationV1beta1ServiceReference;
 import io.kubernetes.client.models.ExtensionsV1beta1Deployment;
 import io.kubernetes.client.models.ExtensionsV1beta1DeploymentSpec;
 import io.kubernetes.client.models.V1ConfigMap;
@@ -63,7 +64,6 @@
 import io.kubernetes.client.models.V1beta1PolicyRule;
 import io.kubernetes.client.models.V1beta1RoleBinding;
 import io.kubernetes.client.models.V1beta1RoleRef;
-import io.kubernetes.client.models.V1beta1ServiceReference;
 import io.kubernetes.client.models.V1beta1Subject;
 import java.util.ArrayList;
 import java.util.List;
@@ -174,8 +174,8 @@ public static V1beta1APIServiceSpec newAPIServiceSpec() {
     return new V1beta1APIServiceSpec();
   }
 
-  public static V1beta1ServiceReference newServiceReference() {
-    return new V1beta1ServiceReference();
+  public static ApiregistrationV1beta1ServiceReference newServiceReference() {
+    return new ApiregistrationV1beta1ServiceReference();
   }
 
   public static V1beta1Ingress newIngress() {