Merge pull request #355 from oracle/fix-2.0

Fix deleteService issues when uptaking kubernetes client 2.0.0

Author: rjeberhard

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

@@ -858,13 +858,19 @@ private com.squareup.okhttp.Call deleteServiceAsync(
    *
    * @param name Name
    * @param namespace Namespace
+   * @param deleteOptions Delete options
    * @param responseStep Response step for when call completes
    * @return Asynchronous step
    */
   public Step deleteServiceAsync(
-      String name, String namespace, ResponseStep<V1Status> responseStep) {
+      String name,
+      String namespace,
+      V1DeleteOptions deleteOptions,
+      ResponseStep<V1Status> responseStep) {
     return createRequestAsync(
-        responseStep, new RequestParams("deleteService", namespace, name, null), DELETE_SERVICE);
+        responseStep,
+        new RequestParams("deleteService", namespace, name, deleteOptions),
+        DELETE_SERVICE);
   }
 
   /* Events */

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

@@ -14,6 +14,7 @@
 import static oracle.kubernetes.operator.logging.MessageKeys.MANAGED_SERVICE_EXISTS;
 import static oracle.kubernetes.operator.logging.MessageKeys.MANAGED_SERVICE_REPLACED;
 
+import io.kubernetes.client.models.V1DeleteOptions;
 import io.kubernetes.client.models.V1ObjectMeta;
 import io.kubernetes.client.models.V1Service;
 import io.kubernetes.client.models.V1ServicePort;
@@ -302,8 +303,10 @@ private Step createNewService(Step next) {
     protected abstract String getServiceCreatedMessageKey();
 
     private Step deleteAndReplaceService(Step next) {
+      V1DeleteOptions deleteOptions = new V1DeleteOptions();
       return new CallBuilder()
-          .deleteServiceAsync(createServiceName(), getNamespace(), new DeleteServiceResponse(next));
+          .deleteServiceAsync(
+              createServiceName(), getNamespace(), deleteOptions, new DeleteServiceResponse(next));
     }
 
     private class DeleteServiceResponse extends ResponseStep<V1Status> {
@@ -389,8 +392,9 @@ public NextAction apply(Packet packet) {
     }
 
     Step deleteService(String name, String namespace) {
+      V1DeleteOptions deleteOptions = new V1DeleteOptions();
       return new CallBuilder()
-          .deleteServiceAsync(name, namespace, new DefaultResponseStep<>(getNext()));
+          .deleteServiceAsync(name, namespace, deleteOptions, new DefaultResponseStep<>(getNext()));
     }
 
     // Set service to null so that watcher doesn't try to recreate service

operator/src/main/java/oracle/kubernetes/operator/steps/DeleteServiceListStep.java

@@ -4,6 +4,7 @@
 
 package oracle.kubernetes.operator.steps;
 
+import io.kubernetes.client.models.V1DeleteOptions;
 import io.kubernetes.client.models.V1ObjectMeta;
 import io.kubernetes.client.models.V1Service;
 import java.util.Collection;
@@ -36,7 +37,9 @@ public NextAction apply(Packet packet) {
 
   private Step createDeleteStep(V1Service service) {
     V1ObjectMeta meta = service.getMetadata();
+    V1DeleteOptions deleteOptions = new V1DeleteOptions();
     return new CallBuilder()
-        .deleteServiceAsync(meta.getName(), meta.getNamespace(), new DefaultResponseStep<>(this));
+        .deleteServiceAsync(
+            meta.getName(), meta.getNamespace(), deleteOptions, new DefaultResponseStep<>(this));
   }
 }

operator/src/test/java/oracle/kubernetes/operator/helpers/ServiceHelperTest.java

@@ -40,6 +40,7 @@
 
 import com.meterware.simplestub.Memento;
 import io.kubernetes.client.ApiException;
+import io.kubernetes.client.models.V1DeleteOptions;
 import io.kubernetes.client.models.V1ObjectMeta;
 import io.kubernetes.client.models.V1Service;
 import io.kubernetes.client.models.V1ServicePort;
@@ -152,7 +153,8 @@ private AsyncCallTestSupport.CannedResponse expectDeleteServiceCall() {
     return testSupport
         .createCannedResponse("deleteService")
         .withName(SERVICE_NAME)
-        .withNamespace(NS);
+        .withNamespace(NS)
+        .withBody(new V1DeleteOptions());
   }
 
   private V1Service createMinimalService() {
@@ -374,7 +376,8 @@ private AsyncCallTestSupport.CannedResponse expectDeleteService(String serviceNa
     return testSupport
         .createCannedResponse("deleteService")
         .withNamespace(NS)
-        .withName(serviceName);
+        .withName(serviceName)
+        .withBody(new V1DeleteOptions());
   }
 
   private V1Service createClusterServiceWithBadVersion() {