Merge pull request #3572 from callingmahendra/master

Added support for passing delete options when using kubectlDelete.#3463

Author: k8s-ci-robot

extended/src/main/java/io/kubernetes/client/extended/kubectl/KubectlDelete.java

@@ -16,31 +16,37 @@
 import io.kubernetes.client.extended.kubectl.exception.KubectlException;
 import io.kubernetes.client.openapi.ApiException;
 import io.kubernetes.client.util.ModelMapper;
+import io.kubernetes.client.util.generic.options.DeleteOptions;
 import org.apache.commons.lang3.StringUtils;
 
 public class KubectlDelete<ApiType extends KubernetesObject>
         extends Kubectl.ResourceBuilder<ApiType, KubectlDelete<ApiType>>
         implements Kubectl.Executable<ApiType> {
 
   private boolean ignoreNotFound = false;
+  private DeleteOptions deleteOptions;
 
   KubectlDelete(Class<ApiType> apiTypeClass) {
     super(apiTypeClass);
+    this.deleteOptions = new DeleteOptions();
   }
 
   public KubectlDelete<ApiType> ignoreNotFound(boolean ignore) {
     this.ignoreNotFound = ignore;
     return this;
   }
-
+  public KubectlDelete<ApiType> deleteOptions(DeleteOptions deleteOptions) {
+    this.deleteOptions = deleteOptions;
+    return this;
+  }
   @Override
   public ApiType execute() throws KubectlException {
     verifyArguments();
     refreshDiscovery();
 
     if (isNamespaced(apiTypeClass)) {
       try {
-        return getGenericApi().delete(namespace, name).throwsApiException().getObject();
+        return getGenericApi().delete(namespace, name,deleteOptions).throwsApiException().getObject();
       } catch (ApiException e) {
         if (ignoreNotFound && e.getCode() == 404) {
           return null;
@@ -50,7 +56,7 @@ public ApiType execute() throws KubectlException {
       }
     } else {
       try {
-        return getGenericApi().delete(name).throwsApiException().getObject();
+        return getGenericApi().delete(name,deleteOptions).throwsApiException().getObject();
       } catch (ApiException e) {
         if (ignoreNotFound && e.getCode() == 404) {
           return null;
@@ -74,5 +80,6 @@ private void verifyArguments() throws KubectlException {
     if (null == name) {
       throw new KubectlException("missing name argument");
     }
+
   }
 }

extended/src/test/java/io/kubernetes/client/extended/kubectl/KubectlDeleteTest.java

@@ -25,6 +25,8 @@
 import io.kubernetes.client.openapi.models.*;
 import io.kubernetes.client.util.ClientBuilder;
 import io.kubernetes.client.util.ModelMapper;
+import io.kubernetes.client.util.generic.options.DeleteOptions;
+
 import java.io.IOException;
 import java.util.Objects;
 
@@ -207,8 +209,14 @@ void kubectlDelete() throws KubectlException, ApiException {
         KubectlDelete<V1Job> kubectlDelete = Kubectl.delete(V1Job.class);
         kubectlDelete.apiClient(apiClient);
         kubectlDelete.namespace("foo").name("bar");
+        DeleteOptions deleteOptions = new DeleteOptions();
+        deleteOptions.setPropagationPolicy("Foreground");
+        kubectlDelete.deleteOptions(deleteOptions);
         kubectlDelete.execute();
-
+        apiServer.verify(
+            1,
+            deleteRequestedFor(urlPathEqualTo("/apis/batch%2Fv1/batch%2Fv1/namespaces/foo/jobs/bar"))
+                .withRequestBody(equalToJson("{\"propagationPolicy\" : \"Foreground\"}")));
         assertThatThrownBy(() -> {
             KubectlDelete<V1Job> kubectlDelete2 = Kubectl.delete(V1Job.class);
             kubectlDelete2.apiClient(apiClient);

util/src/main/java/io/kubernetes/client/util/generic/GenericKubernetesApi.java

@@ -1159,7 +1159,7 @@ private CallBuilder makeNamespacedDeleteCallBuilder(
             namespace,
             this.resourcePlural,
             name)
-                // TODO: fill/convert the option
+                .body(deleteOptions)
                 .buildCall(null);
   }