Skip to content

Commit fefd20f

Browse files
committed
add Api and Object management
1 parent 74e3522 commit fefd20f

32 files changed

Lines changed: 416 additions & 563 deletions

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>io.github.kubesys</groupId>
77
<artifactId>client-java</artifactId>
8-
<version>1.0.5</version>
8+
<version>1.0.6</version>
99
<packaging>jar</packaging>
1010

1111
<name>client-java</name>

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

Lines changed: 226 additions & 199 deletions
Large diffs are not rendered by default.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public abstract class KubernetesOperator<O> {
4242

4343
protected KubernetesOperator(KubernetesClient client, String kind) throws Exception {
4444
this.client = client;
45-
client.watchResources(kind, new KubernetesObjectWatcher<O>(client) {
45+
client.watchResourcesByFullkind(kind, new KubernetesObjectWatcher<O>(client) {
4646

4747
@Override
4848
public void doObjectAdded(O node) {

src/main/java/io/github/kubesys/client/annotations/Api.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,8 @@
2929
/**
3030
* @return author and/or email
3131
*/
32-
String[] author() default {};
32+
String[] author() default {"wuheng@iscas.ac.cn"};
3333

34-
/**
35-
* @return MM-YY-DD
36-
*/
37-
String date() default "";
38-
3934
/**
4035
* @return all exceptions
4136
*/

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,12 @@ public static JsonNode yamlStringToJsonNode(String yaml) throws JsonProcessingEx
5252
* { "apiVersion": "v1", "kind": "Binding", "metadata": { "name": "podName" },
5353
* "target": { "apiVersion": "v1", "kind": "Node", "name": "hostName" } }
5454
*
55-
* @param podName name
5655
* @param podNamespace namespace
56+
* @param podName name
5757
* @param hostName hostname
5858
* @return json json from Kubernetes
5959
*/
60-
public static JsonNode toBinding(String podName, String podNamespace, String hostName) {
60+
public static JsonNode toBinding(String podNamespace, String podName, String hostName) {
6161

6262
ObjectNode binding = new ObjectMapper().createObjectNode();
6363
binding.put(KubernetesConstants.KUBE_APIVERSION, KubernetesConstants.DEFAULT_APIVERSION);

src/main/java/io/github/kubesys/client/watchers/KubernetesCRDWacther.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public void doClose() {
8686
m_logger.info("watcher apiextensions.k8s.io.CustomResourceDefinition is crash");
8787
m_logger.info("wait 5 seconds to restart watcher apiextensions.k8s.io.CustomResourceDefinition ");
8888
Thread.sleep(5000);
89-
client.watchResources("apiextensions.k8s.io.CustomResourceDefinition",
89+
client.watchResourcesByFullkindAndNamespace("apiextensions.k8s.io.CustomResourceDefinition",
9090
KubernetesConstants.VALUE_ALL_NAMESPACES,
9191
new KubernetesCRDWacther(client));
9292
break;

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

Lines changed: 0 additions & 86 deletions
This file was deleted.

src/test/java/io/github/kubesys/client/AbstractKubernetesClientTest.java renamed to src/test/java/io/github/kubesys/client/examples/AbstractClient.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
11
/**
22
* Copyright (2020, ) Institute of Software, Chinese Academy of Sciences
33
*/
4-
package io.github.kubesys.client;
4+
package io.github.kubesys.client.examples;
55

66
import java.io.File;
77

8+
import io.github.kubesys.client.KubernetesAnalyzer;
9+
import io.github.kubesys.client.KubernetesClient;
10+
811
/**
912
* @author wuheng09@gmail.com
1013
*
1114
*/
12-
public abstract class AbstractKubernetesClientTest {
15+
public abstract class AbstractClient {
1316

1417
public static KubernetesClient createClient1(KubernetesAnalyzer ana) throws Exception {
1518
return (ana == null) ? new KubernetesClient(System.getenv("url"), System.getenv("token")) :

src/test/java/io/github/kubesys/client/testcases/GetAllKindDesc.java renamed to src/test/java/io/github/kubesys/client/examples/GetAllKindDescExample.java

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,22 @@
11
/**
22
* Copyright (2020, ) Institute of Software, Chinese Academy of Sciences
33
*/
4-
package io.github.kubesys.client.testcases;
4+
package io.github.kubesys.client.examples;
55

66

7-
8-
import java.util.Base64;
9-
10-
import io.github.kubesys.client.AbstractKubernetesClientTest;
117
import io.github.kubesys.client.KubernetesClient;
128

139

1410
/**
1511
* @author wuheng09@gmail.com
1612
*
1713
*/
18-
public class GetAllKindDesc extends AbstractKubernetesClientTest {
14+
public class GetAllKindDescExample extends AbstractClient {
1915

20-
2116
public static void main(String[] args) throws Exception {
22-
System.out.println(Base64.getEncoder().encodeToString("admin".getBytes()));
23-
System.out.println(Base64.getEncoder().encodeToString("admin:admin".getBytes()));
2417
KubernetesClient client = createClient1(null);
2518
System.out.println(client.getKinds().toPrettyString());
19+
System.out.println("------------------------------------");
2620
System.out.println(client.getKindDesc().toPrettyString());
2721
}
2822

src/test/java/io/github/kubesys/client/testcases/WriterTest.java renamed to src/test/java/io/github/kubesys/client/examples/JsonAndYamlExample.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,20 @@
11
/**
22
* Copyright (2020, ) Institute of Software, Chinese Academy of Sciences
33
*/
4-
package io.github.kubesys.client.testcases;
4+
package io.github.kubesys.client.examples;
55

66

77
import com.fasterxml.jackson.databind.JsonNode;
88
import com.fasterxml.jackson.databind.ObjectMapper;
99

10-
import io.github.kubesys.client.AbstractKubernetesClientTest;
1110
import io.github.kubesys.client.KubernetesWriter;
1211

1312

1413
/**
1514
* @author wuheng09@gmail.com
1615
*
1716
*/
18-
public class WriterTest extends AbstractKubernetesClientTest {
17+
public class JsonAndYamlExample extends AbstractClient {
1918

2019
static String CreateJSON = "{\r\n"
2120
+ " \"apiVersion\": \"v1\",\r\n"

0 commit comments

Comments
 (0)