Merge pull request #2645 from v1ku/fix-delete-label-issue

Fixed bug: label being set as null instead of deleted

Author: k8s-ci-robot

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

@@ -38,7 +38,7 @@ public KubectlLabel<ApiType> addLabel(String key, String value) {
   }
 
   public KubectlLabel<ApiType> deleteLabel(String key) {
-    this.addingLabels.put(key, "null");
+    this.addingLabels.remove(key);
     return this;
   }
 

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

@@ -91,7 +91,7 @@ public void testKubectlDeleteLabelNamespacedResourceShouldWork() throws KubectlE
     wireMockRule.stubFor(
         put(urlPathEqualTo("/api/v1/namespaces/default/pods/foo"))
             .withRequestBody(
-                matchingJsonPath("$.metadata.labels", equalToJson("{ \"k1\": \"null\" }")))
+                matchingJsonPath("$.metadata.labels", equalToJson("{}")))
             .willReturn(
                 aResponse()
                     .withStatus(200)
@@ -174,7 +174,7 @@ public void testKubectlDeleteLabelClusterResourceShouldWork() throws KubectlExce
     wireMockRule.stubFor(
         put(urlPathEqualTo("/api/v1/nodes/foo"))
             .withRequestBody(
-                matchingJsonPath("$.metadata.labels", equalToJson("{ \"k1\": \"null\" }")))
+                matchingJsonPath("$.metadata.labels", equalToJson("{}")))
             .willReturn(aResponse().withStatus(200).withBody("{\"metadata\":{\"name\":\"foo\"}}")));
 
     V1Node unlabelledNode =