add listWithFields

Author: syswu

pom.xml

@@ -5,14 +5,14 @@
 
 	<groupId>io.github.kubesys</groupId>
 	<artifactId>kubernetes-client</artifactId>
-	<version>2.2.0</version>
+	<version>2.2.1</version>
 	<packaging>jar</packaging>
 
 	<name>kubernetes-client</name>
 	<url>http://maven.apache.org</url>
 
 	<properties>
-		<jackson.version>2.13.4</jackson.version>
+		<jackson.version>2.14.0-rc2</jackson.version>
 		<httpclient.version>5.1.3</httpclient.version>
 		<junit.version>4.13.2</junit.version>
 	</properties>

src/main/java/io/github/kubesys/client/KubernetesClient.java

@@ -63,6 +63,7 @@
 import io.github.kubesys.client.core.KubernetesRuleBase;
 import io.github.kubesys.client.utils.ReqUtil;
 import io.github.kubesys.client.utils.SSLUtil;
+import io.github.kubesys.client.utils.URLUtil;
 
 /**
  * This class is used for creating a connection between users' application and Kubernetes server.
@@ -356,6 +357,28 @@ public boolean hasResource(String kind, String namespace, String name) throws Ex
 	public JsonNode listResources(String kind) throws Exception {
 		return listResources(kind, KubernetesConstants.VALUE_ALL_NAMESPACES, null, null, 0, null);
 	}
+	
+	/**
+	 * list all Kubernetes resources using kind
+	 * 
+	 * @param kind kind
+	 * @return json json
+	 * @throws Exception Kubernetes cannot parsing this jsonStr
+	 */
+	public JsonNode listResourcesWithField(String kind, Map<String, String> fields) throws Exception {
+		return listResources(kind, KubernetesConstants.VALUE_ALL_NAMESPACES, URLUtil.fromMap(fields), null, 0, null);
+	}
+	
+	/**
+	 * list all Kubernetes resources using kind
+	 * 
+	 * @param kind kind
+	 * @return json json
+	 * @throws Exception Kubernetes cannot parsing this jsonStr
+	 */
+	public JsonNode listResourcesWithLabel(String kind, Map<String, String> labels) throws Exception {
+		return listResources(kind, KubernetesConstants.VALUE_ALL_NAMESPACES, null, URLUtil.fromMap(labels), 0, null);
+	}
 
 	/**
 	 * list all Kubernetes resources using kind and namespace
@@ -368,6 +391,29 @@ public JsonNode listResources(String kind) throws Exception {
 	public JsonNode listResources(String kind, String namespace) throws Exception {
 		return listResources(kind, namespace, null, null, 0, null);
 	}
+	
+	/**
+	 * list all Kubernetes resources using kind
+	 * 
+	 * @param kind kind
+	 * @return json json
+	 * @throws Exception Kubernetes cannot parsing this jsonStr
+	 */
+	public JsonNode listResourcesWithField(String kind, String namespace,  Map<String, String> fields) throws Exception {
+		return listResources(kind, namespace, URLUtil.fromMap(fields), null, 0, null);
+	}
+	
+	/**
+	 * list all Kubernetes resources using kind and namespace
+	 * 
+	 * @param kind      kind
+	 * @param namespace namespace
+	 * @return json json
+	 * @throws Exception Kubernetes cannot parsing this jsonStr
+	 */
+	public JsonNode listResourcesWithLabel(String kind, String namespace, Map<String, String> labels) throws Exception {
+		return listResources(kind, namespace, null, URLUtil.fromMap(labels), 0, null);
+	}
 
 	/**
 	 * list all Kubernetes resources using kind, namespace, fieldSelector and

src/main/java/io/github/kubesys/client/utils/URLUtil.java

@@ -5,6 +5,7 @@
 
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.Map;
 import java.util.logging.Logger;
 
 import io.github.kubesys.client.KubernetesConstants;
@@ -77,4 +78,19 @@ public static String namespacePath(boolean namespaced, String namespace) {
 				? KubernetesConstants.KUBEAPI_NAMESPACES_PATTERN + namespace
 				: KubernetesConstants.VALUE_ALL_NAMESPACES;
 	}
+	
+	public static String fromMap(Map<String, String> map) {
+		//%3D
+		if (map == null || map.size() == 0) {
+			return null;
+		}
+		
+		
+		StringBuilder sb = new StringBuilder();
+		for (String key : map.keySet()) {
+			sb.append(key + "%3D" + map.get(key) + ",");
+		}
+		
+		return sb.substring(0, sb.length() - 1);
+	}
 }

src/test/java/io/github/kubesys/client/AbstractKubernetesClientTest.java

@@ -11,13 +11,8 @@
  */
 public abstract class AbstractKubernetesClientTest {
 
-	static String URL = "https://120.46.180.58:6443/";
-	
-	// kubectl -n kube-system get secret $(kubectl -n kube-system get secret | grep kuboard-user | awk '{print $1}') -o go-template='{{.data.token}}' | base64 -d
-	static String TOKEN = "";
-
 	public static KubernetesClient createClient1(KubernetesAnalyzer ana) throws Exception {
-		return (ana == null) ? new KubernetesClient(URL, TOKEN) : new KubernetesClient(URL, TOKEN, ana);
+		return (ana == null) ? new KubernetesClient(new File(".token")) : new KubernetesClient(new File(".token"), ana);
 	}
 
 	public static KubernetesClient createClient2(KubernetesAnalyzer ana) throws Exception {

src/test/java/io/github/kubesys/client/testcases/ListNodesTest.java

@@ -0,0 +1,35 @@
+/**
+ * Copyright (2020, ) Institute of Software, Chinese Academy of Sciences
+ */
+package io.github.kubesys.client.testcases;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import io.github.kubesys.client.AbstractKubernetesClientTest;
+import io.github.kubesys.client.KubernetesClient;
+
+/**
+ * @author wuheng09@gmail.com
+ *
+ */
+public class ListNodesTest extends AbstractKubernetesClientTest {
+
+	
+	/**
+	 * see command `kubectl api-resources`
+	 * 
+	 * @param args
+	 * @throws Exception
+	 */
+	public static void main(String[] args) throws Exception {
+		KubernetesClient client = createClient1(null);
+		Map<String, String> map= new HashMap<>();
+		map.put("host", "vm.node133");
+		// Just kind
+		System.out.println(client.listResources("Node").get("items").size());
+		System.out.println(client.listResourcesWithLabel("Node", map).get("items").size());
+		
+	}
+
+}