fixes kubectl-drain failures and adding e2e tests

Author: yue9944882

e2e/src/test/groovy/io/kubernetes/client/e2e/informer/NamespaceInformerTest.groovy

@@ -23,30 +23,30 @@ import spock.util.concurrent.PollingConditions
 
 class NamespaceInformerTest extends Specification {
 
-    def "list-watching namespaces should work" () {
-    given:
-        def conditions = new PollingConditions();
-            def apiClient = ClientBuilder.defaultClient();
-            def api = new GenericKubernetesApi(
-                    V1Namespace.class,
-                    V1NamespaceList.class,
-                    "",
-                    "v1",
-                    "namespaces",
-                    apiClient)
-            def informerFactory = new SharedInformerFactory();
-            def nsInformer = informerFactory.sharedIndexInformerFor(
-                    api,
-                    V1Namespace.class,
-                    0)
-            def nsLister = new Lister(nsInformer.getIndexer());
-        when:
-            informerFactory.startAllRegisteredInformers();
-        then:
-            conditions.eventually {
-                nsInformer.hasSynced()
-                nsLister.list().size() > 0
-            }
-    }
+	def "list-watching namespaces should work"() {
+		given:
+			def conditions = new PollingConditions()
+			def apiClient = ClientBuilder.defaultClient()
+			def api = new GenericKubernetesApi(
+					V1Namespace.class,
+					V1NamespaceList.class,
+					"",
+					"v1",
+					"namespaces",
+					apiClient)
+			def informerFactory = new SharedInformerFactory()
+			def nsInformer = informerFactory.sharedIndexInformerFor(
+					api,
+					V1Namespace.class,
+					0)
+			def nsLister = new Lister(nsInformer.getIndexer())
+		when:
+			informerFactory.startAllRegisteredInformers()
+		then:
+			conditions.eventually {
+				nsInformer.hasSynced()
+				nsLister.list().size() > 0
+			}
+	}
 
 }

e2e/src/test/groovy/io/kubernetes/client/e2e/kubectl/KubectlDrainTest.groovy

@@ -0,0 +1,63 @@
+/*
+Copyright 2020 The Kubernetes Authors.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package io.kubernetes.client.e2e.kubectl
+
+import io.kubernetes.client.extended.kubectl.Kubectl
+import io.kubernetes.client.extended.kubectl.exception.KubectlException
+import io.kubernetes.client.openapi.ApiException
+import io.kubernetes.client.openapi.Configuration
+import io.kubernetes.client.openapi.models.V1Container
+import io.kubernetes.client.openapi.models.V1Node
+import io.kubernetes.client.openapi.models.V1ObjectMeta
+import io.kubernetes.client.openapi.models.V1Pod
+import io.kubernetes.client.openapi.models.V1PodSpec
+import io.kubernetes.client.util.ClientBuilder
+import spock.lang.Specification
+
+class KubectlDrainTest extends Specification {
+	def "Kubectl drain should work"() {
+		given:
+			def apiClient = ClientBuilder.defaultClient()
+			Configuration.setDefaultApiClient(apiClient)
+			def testNode = new V1Node()
+					.metadata(new V1ObjectMeta().name("foo"))
+			def testPod = new V1Pod()
+					.metadata(new V1ObjectMeta()
+							.namespace("default")
+							.name("bar"))
+					.spec(new V1PodSpec()
+							.nodeName("foo")
+							.containers(Arrays.asList(
+									new V1Container().name("c1").image("nginx")
+							)))
+		when:
+			V1Node createdNode = Kubectl.create(V1Node.class).resource(testNode).execute()
+			V1Pod createdPod = Kubectl.create(V1Pod.class).resource(testPod).execute()
+		then:
+			createdNode != null
+			createdPod != null
+		when:
+			V1Node drainedNode = Kubectl.drain().gracePeriod(0).name("foo").execute()
+		then:
+			drainedNode != null
+		when:
+			Kubectl.get(V1Pod.class).namespace("default").name("bar").execute()
+		then:
+			def e = thrown KubectlException
+			e.getCause().class == ApiException.class
+		cleanup:
+			Kubectl.delete(V1Node.class).name("foo").execute()
+	}
+
+}

e2e/src/test/groovy/io/kubernetes/client/e2e/kubectl/KubectlNamespaceTest.groovy

@@ -1,13 +1,23 @@
+/*
+Copyright 2020 The Kubernetes Authors.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
 package io.kubernetes.client.e2e.kubectl
 
 import io.kubernetes.client.extended.kubectl.Kubectl
-import io.kubernetes.client.extended.kubectl.exception.KubectlException
-import io.kubernetes.client.openapi.ApiException
 import io.kubernetes.client.openapi.models.V1Namespace
 import io.kubernetes.client.openapi.models.V1ObjectMeta
 import io.kubernetes.client.util.ClientBuilder
 import spock.lang.Specification
-import spock.util.concurrent.PollingConditions
 
 class KubectlNamespaceTest extends Specification {
 

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

@@ -17,7 +17,7 @@
 import io.kubernetes.client.openapi.ApiException;
 import io.kubernetes.client.openapi.models.V1Node;
 
-public class KubectlCordon extends Kubectl.ResourceAndContainerBuilder<V1Node, KubectlCordon>
+public class KubectlCordon extends Kubectl.ResourceBuilder<V1Node, KubectlCordon>
     implements Kubectl.Executable<V1Node> {
 
   static final String CORDON_PATCH_STR =

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

@@ -51,6 +51,7 @@ public KubectlDrain ignoreDaemonSets() {
   @Override
   public V1Node execute() throws KubectlException {
     try {
+      refreshDiscovery();
       return doDrain();
     } catch (ApiException | IOException ex) {
       throw new KubectlException(ex);
@@ -102,14 +103,14 @@ private void validatePods(List<V1Pod> pods) throws KubectlException {
 
   private void deletePod(CoreV1Api api, String name, String namespace)
       throws ApiException, IOException, KubectlException {
-    api.deleteNamespacedPod(name, namespace, null, null, null, null, null, null);
+    api.deleteNamespacedPod(name, namespace, null, null, this.timeoutSeconds, null, null, null);
     waitForPodDelete(api, name, namespace);
   }
 
   private void waitForPodDelete(CoreV1Api api, String name, String namespace)
-      throws ApiException, IOException, KubectlException {
+      throws KubectlException {
     long start = System.currentTimeMillis();
-    while (System.currentTimeMillis() - start < timeoutSeconds * 1000) {
+    do {
       try {
         api.readNamespacedPod(name, namespace, null, null, null);
       } catch (ApiException ex) {
@@ -118,7 +119,7 @@ private void waitForPodDelete(CoreV1Api api, String name, String namespace)
         }
         throw new KubectlException(ex);
       }
-    }
+    } while (System.currentTimeMillis() - start < timeoutSeconds * 1000);
     throw new KubectlException("Timed out waiting for Pod delete.");
   }
 }

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

@@ -65,7 +65,7 @@ public void testDrainNodeNoPods() throws KubectlException, IOException {
         get(urlPathEqualTo("/api/v1/pods"))
             .withQueryParam("fieldSelector", equalTo("spec.nodeName=node1"))
             .willReturn(aResponse().withStatus(200).withBody("{}")));
-    V1Node node = new KubectlDrain().apiClient(apiClient).name("node1").execute();
+    V1Node node = new KubectlDrain().skipDiscovery().apiClient(apiClient).name("node1").execute();
     wireMockRule.verify(1, patchRequestedFor(urlPathEqualTo("/api/v1/nodes/node1")));
     wireMockRule.verify(1, getRequestedFor(urlPathEqualTo("/api/v1/pods")));
     assertEquals("node1", node.getMetadata().getName());
@@ -92,7 +92,7 @@ public void testDrainNodePods() throws KubectlException, IOException {
         get(urlPathEqualTo("/api/v1/namespaces/mssql/pods/mssql-75b8b44f6b-znftp"))
             .willReturn(aResponse().withStatus(404).withBody("{}")));
 
-    V1Node node = new KubectlDrain().apiClient(apiClient).name("node1").execute();
+    V1Node node = new KubectlDrain().skipDiscovery().apiClient(apiClient).name("node1").execute();
     wireMockRule.verify(1, patchRequestedFor(urlPathEqualTo("/api/v1/nodes/node1")));
     wireMockRule.verify(1, getRequestedFor(urlPathEqualTo("/api/v1/pods")));
     wireMockRule.verify(