Merge pull request #2465 from shubhbapna/deleteLabel

Delete label

Author: k8s-ci-robot

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

@@ -37,6 +37,11 @@ public KubectlLabel<ApiType> addLabel(String key, String value) {
     return this;
   }
 
+  public KubectlLabel<ApiType> deleteLabel(String key) {
+    this.addingLabels.put(key, "null");
+    return this;
+  }
+
   @Override
   public ApiType execute() throws KubectlException {
     verifyArguments();

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

@@ -79,6 +79,37 @@ public void testKubectlLabelNamespacedResourceShouldWork() throws KubectlExcepti
     assertNotNull(labelledPod);
   }
 
+  @Test
+  public void testKubectlDeleteLabelNamespacedResourceShouldWork() throws KubectlException {
+    wireMockRule.stubFor(
+        get(urlPathEqualTo("/api/v1/namespaces/default/pods/foo"))
+            .willReturn(
+                aResponse()
+                    .withStatus(200)
+                    .withBody("{\"metadata\":{\"name\":\"foo\",\"namespace\":\"default\"}}")));
+    wireMockRule.stubFor(
+        put(urlPathEqualTo("/api/v1/namespaces/default/pods/foo"))
+            .withRequestBody(
+                matchingJsonPath("$.metadata.labels", equalToJson("{ \"k1\": \"null\" }")))
+            .willReturn(
+                aResponse()
+                    .withStatus(200)
+                    .withBody("{\"metadata\":{\"name\":\"foo\",\"namespace\":\"default\"}}")));
+
+    V1Pod unlabelledPod =
+        Kubectl.label(V1Pod.class)
+            .apiClient(apiClient)
+            .skipDiscovery()
+            .namespace("default")
+            .name("foo")
+            .deleteLabel("k1")
+            .execute();
+
+    wireMockRule.verify(1, getRequestedFor(urlPathEqualTo("/api/v1/namespaces/default/pods/foo")));
+    wireMockRule.verify(1, putRequestedFor(urlPathEqualTo("/api/v1/namespaces/default/pods/foo")));
+    assertNotNull(unlabelledPod);
+  }
+
   @Test
   public void testKubectlLabelNamespacedResourceReceiveForbiddenShouldThrowException()
       throws KubectlException {
@@ -134,6 +165,29 @@ public void testKubectlLabelClusterResourceShouldWork() throws KubectlException
     assertNotNull(labelledNode);
   }
 
+  @Test
+  public void testKubectlDeleteLabelClusterResourceShouldWork() throws KubectlException {
+    wireMockRule.stubFor(
+        get(urlPathEqualTo("/api/v1/nodes/foo"))
+            .willReturn(aResponse().withStatus(200).withBody("{\"metadata\":{\"name\":\"foo\"}}")));
+    wireMockRule.stubFor(
+        put(urlPathEqualTo("/api/v1/nodes/foo"))
+            .withRequestBody(
+                matchingJsonPath("$.metadata.labels", equalToJson("{ \"k1\": \"null\" }")))
+            .willReturn(aResponse().withStatus(200).withBody("{\"metadata\":{\"name\":\"foo\"}}")));
+
+    V1Node unlabelledNode =
+        Kubectl.label(V1Node.class)
+            .apiClient(apiClient)
+            .skipDiscovery()
+            .name("foo")
+            .deleteLabel("k1")
+            .execute();
+    wireMockRule.verify(1, getRequestedFor(urlPathEqualTo("/api/v1/nodes/foo")));
+    wireMockRule.verify(1, putRequestedFor(urlPathEqualTo("/api/v1/nodes/foo")));
+    assertNotNull(unlabelledNode);
+  }
+
   @Test
   public void testKubectlLabelClusterResourceReceiveForbiddenShouldThrowException()
       throws KubectlException {