Skip to content

Commit b71f64c

Browse files
unixfoxunixfox
committed
add autoreconnect in case pod watch is closed
and bump version
1 parent da14c2f commit b71f64c

File tree

4 files changed

+119
-85
lines changed

4 files changed

+119
-85
lines changed

‎DockerizedCraft.iml‎

Lines changed: 79 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -10,76 +10,97 @@
1010
</content>
1111
<orderEntry type="inheritedJdk" />
1212
<orderEntry type="sourceFolder" forTests="false" />
13-
<orderEntry type="library" scope="PROVIDED" name="Maven: net.md-5:bungeecord-api:1.12-SNAPSHOT" level="project" />
14-
<orderEntry type="library" scope="PROVIDED" name="Maven: net.md-5:bungeecord-chat:1.12-SNAPSHOT" level="project" />
15-
<orderEntry type="library" scope="PROVIDED" name="Maven: net.md-5:bungeecord-config:1.12-SNAPSHOT" level="project" />
16-
<orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.19" level="project" />
17-
<orderEntry type="library" scope="PROVIDED" name="Maven: net.md-5:bungeecord-event:1.12-SNAPSHOT" level="project" />
18-
<orderEntry type="library" scope="PROVIDED" name="Maven: net.md-5:bungeecord-protocol:1.12-SNAPSHOT" level="project" />
19-
<orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.25.Final" level="project" />
20-
<orderEntry type="library" scope="PROVIDED" name="Maven: net.sf.trove4j:trove4j:3.0.3" level="project" />
21-
<orderEntry type="library" name="Maven: com.google.guava:guava:20.0" level="project" />
22-
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.0" level="project" />
23-
<orderEntry type="library" name="Maven: io.fabric8:kubernetes-client:4.1.1" level="project" />
24-
<orderEntry type="library" name="Maven: io.fabric8:kubernetes-model:4.1.1" level="project" />
25-
<orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.7.5" level="project" />
26-
<orderEntry type="library" name="Maven: javax.validation:validation-api:1.1.0.Final" level="project" />
27-
<orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.9.1" level="project" />
28-
<orderEntry type="library" name="Maven: com.squareup.okio:okio:1.13.0" level="project" />
29-
<orderEntry type="library" name="Maven: com.squareup.okhttp3:logging-interceptor:3.9.1" level="project" />
30-
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.13" level="project" />
31-
<orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.13" level="project" />
32-
<orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.9.7" level="project" />
33-
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.7" level="project" />
34-
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.0" level="project" />
35-
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.7" level="project" />
13+
<orderEntry type="library" scope="PROVIDED" name="Maven: net.md-5:bungeecord-api:1.15-SNAPSHOT" level="project" />
14+
<orderEntry type="library" scope="PROVIDED" name="Maven: net.md-5:bungeecord-chat:1.15-SNAPSHOT" level="project" />
15+
<orderEntry type="library" scope="PROVIDED" name="Maven: net.md-5:bungeecord-config:1.15-SNAPSHOT" level="project" />
16+
<orderEntry type="library" scope="PROVIDED" name="Maven: net.md-5:bungeecord-event:1.15-SNAPSHOT" level="project" />
17+
<orderEntry type="library" scope="PROVIDED" name="Maven: net.md-5:bungeecord-protocol:1.15-SNAPSHOT" level="project" />
18+
<orderEntry type="library" scope="PROVIDED" name="Maven: net.md-5:brigadier:1.0.16-SNAPSHOT" level="project" />
19+
<orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.49.Final" level="project" />
20+
<orderEntry type="library" scope="PROVIDED" name="Maven: net.sf.trove4j:core:3.1.0" level="project" />
21+
<orderEntry type="library" name="Maven: io.netty:netty-transport-native-unix-common:4.1.49.Final" level="project" />
22+
<orderEntry type="library" name="Maven: io.netty:netty-common:4.1.49.Final" level="project" />
23+
<orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.49.Final" level="project" />
24+
<orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.49.Final" level="project" />
25+
<orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.49.Final" level="project" />
26+
<orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.25" level="project" />
27+
<orderEntry type="library" name="Maven: com.google.guava:guava:21.0" level="project" />
28+
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.6" level="project" />
29+
<orderEntry type="library" name="Maven: io.fabric8:kubernetes-client:4.10.2" level="project" />
30+
<orderEntry type="library" name="Maven: io.fabric8:kubernetes-model-core:4.10.2" level="project" />
31+
<orderEntry type="library" name="Maven: io.fabric8:kubernetes-model-common:4.10.2" level="project" />
32+
<orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.10.3" level="project" />
33+
<orderEntry type="library" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.2" level="project" />
34+
<orderEntry type="library" name="Maven: jakarta.activation:jakarta.activation-api:1.2.1" level="project" />
35+
<orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
36+
<orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.3.0" level="project" />
37+
<orderEntry type="library" name="Maven: io.fabric8:kubernetes-model-rbac:4.10.2" level="project" />
38+
<orderEntry type="library" name="Maven: io.fabric8:kubernetes-model-admissionregistration:4.10.2" level="project" />
39+
<orderEntry type="library" name="Maven: io.fabric8:kubernetes-model-apps:4.10.2" level="project" />
40+
<orderEntry type="library" name="Maven: io.fabric8:kubernetes-model-autoscaling:4.10.2" level="project" />
41+
<orderEntry type="library" name="Maven: io.fabric8:kubernetes-model-apiextensions:4.10.2" level="project" />
42+
<orderEntry type="library" name="Maven: io.fabric8:kubernetes-model-batch:4.10.2" level="project" />
43+
<orderEntry type="library" name="Maven: io.fabric8:kubernetes-model-certificates:4.10.2" level="project" />
44+
<orderEntry type="library" name="Maven: io.fabric8:kubernetes-model-coordination:4.10.2" level="project" />
45+
<orderEntry type="library" name="Maven: io.fabric8:kubernetes-model-discovery:4.10.2" level="project" />
46+
<orderEntry type="library" name="Maven: io.fabric8:kubernetes-model-events:4.10.2" level="project" />
47+
<orderEntry type="library" name="Maven: io.fabric8:kubernetes-model-extensions:4.10.2" level="project" />
48+
<orderEntry type="library" name="Maven: io.fabric8:kubernetes-model-networking:4.10.2" level="project" />
49+
<orderEntry type="library" name="Maven: io.fabric8:kubernetes-model-metrics:4.10.2" level="project" />
50+
<orderEntry type="library" name="Maven: io.fabric8:kubernetes-model-policy:4.10.2" level="project" />
51+
<orderEntry type="library" name="Maven: io.fabric8:kubernetes-model-scheduling:4.10.2" level="project" />
52+
<orderEntry type="library" name="Maven: io.fabric8:kubernetes-model-settings:4.10.2" level="project" />
53+
<orderEntry type="library" name="Maven: io.fabric8:kubernetes-model-storageclass:4.10.2" level="project" />
54+
<orderEntry type="library" name="Maven: io.fabric8:openshift-model:4.10.2" level="project" />
55+
<orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.12.12" level="project" />
56+
<orderEntry type="library" name="Maven: com.squareup.okio:okio:1.15.0" level="project" />
57+
<orderEntry type="library" name="Maven: com.squareup.okhttp3:logging-interceptor:3.12.12" level="project" />
58+
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
59+
<orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.10.3" level="project" />
60+
<orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.10.3" level="project" />
61+
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.10.3" level="project" />
62+
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.10.3" level="project" />
63+
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.10.3" level="project" />
3664
<orderEntry type="library" name="Maven: io.fabric8:zjsonpatch:0.3.0" level="project" />
37-
<orderEntry type="library" name="Maven: com.github.mifmif:generex:1.0.1" level="project" />
65+
<orderEntry type="library" name="Maven: com.github.mifmif:generex:1.0.2" level="project" />
3866
<orderEntry type="library" name="Maven: dk.brics.automaton:automaton:1.11-8" level="project" />
39-
<orderEntry type="library" name="Maven: com.github.docker-java:docker-java:3.1.0-rc-2" level="project" />
40-
<orderEntry type="library" name="Maven: com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.6.4" level="project" />
41-
<orderEntry type="library" name="Maven: com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:2.6.4" level="project" />
42-
<orderEntry type="library" name="Maven: org.glassfish.jersey.connectors:jersey-apache-connector:2.26" level="project" />
43-
<orderEntry type="library" name="Maven: org.glassfish.jersey.core:jersey-common:2.26" level="project" />
44-
<orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.2" level="project" />
67+
<orderEntry type="library" name="Maven: com.github.docker-java:docker-java:3.1.5" level="project" />
68+
<orderEntry type="library" name="Maven: com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.9.8" level="project" />
69+
<orderEntry type="library" name="Maven: com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:2.9.8" level="project" />
70+
<orderEntry type="library" name="Maven: org.glassfish.jersey.connectors:jersey-apache-connector:2.27" level="project" />
71+
<orderEntry type="library" name="Maven: org.glassfish.jersey.core:jersey-common:2.27" level="project" />
4572
<orderEntry type="library" name="Maven: org.glassfish.hk2:osgi-resource-locator:1.0.1" level="project" />
4673
<orderEntry type="library" name="Maven: javax.ws.rs:javax.ws.rs-api:2.1" level="project" />
47-
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.5" level="project" />
48-
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5" level="project" />
49-
<orderEntry type="library" name="Maven: org.glassfish.jersey.core:jersey-client:2.26" level="project" />
74+
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.10" level="project" />
75+
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.6" level="project" />
76+
<orderEntry type="library" name="Maven: org.glassfish.jersey.core:jersey-client:2.27" level="project" />
5077
<orderEntry type="library" name="Maven: org.glassfish.hk2.external:javax.inject:2.5.0-b42" level="project" />
51-
<orderEntry type="library" name="Maven: org.glassfish.jersey.inject:jersey-hk2:2.26" level="project" />
78+
<orderEntry type="library" name="Maven: org.glassfish.jersey.inject:jersey-hk2:2.27" level="project" />
5279
<orderEntry type="library" name="Maven: org.glassfish.hk2:hk2-locator:2.5.0-b42" level="project" />
5380
<orderEntry type="library" name="Maven: org.glassfish.hk2.external:aopalliance-repackaged:2.5.0-b42" level="project" />
5481
<orderEntry type="library" name="Maven: org.glassfish.hk2:hk2-api:2.5.0-b42" level="project" />
5582
<orderEntry type="library" name="Maven: javax.inject:javax.inject:1" level="project" />
5683
<orderEntry type="library" name="Maven: org.glassfish.hk2:hk2-utils:2.5.0-b42" level="project" />
5784
<orderEntry type="library" name="Maven: org.javassist:javassist:3.22.0-CR2" level="project" />
58-
<orderEntry type="library" name="Maven: com.kohlschutter.junixsocket:junixsocket-common:2.0.4" level="project" />
59-
<orderEntry type="library" name="Maven: com.kohlschutter.junixsocket:junixsocket-native-common:2.0.4" level="project" />
60-
<orderEntry type="library" name="Maven: org.scijava:native-lib-loader:2.0.2" level="project" />
61-
<orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.12" level="project" />
62-
<orderEntry type="library" name="Maven: commons-codec:commons-codec:1.10" level="project" />
85+
<orderEntry type="library" name="Maven: com.kohlschutter.junixsocket:junixsocket-common:2.2.0" level="project" />
86+
<orderEntry type="library" name="Maven: com.kohlschutter.junixsocket:junixsocket-native-common:2.2.0" level="project" />
87+
<orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.18" level="project" />
88+
<orderEntry type="library" name="Maven: commons-codec:commons-codec:1.11" level="project" />
6389
<orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
64-
<orderEntry type="library" name="Maven: commons-io:commons-io:2.5" level="project" />
65-
<orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.21" level="project" />
66-
<orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.54" level="project" />
67-
<orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.54" level="project" />
68-
<orderEntry type="library" name="Maven: io.netty:netty-codec-http:4.1.14.Final" level="project" />
69-
<orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.14.Final" level="project" />
70-
<orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.14.Final" level="project" />
71-
<orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.14.Final" level="project" />
72-
<orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.14.Final" level="project" />
73-
<orderEntry type="library" name="Maven: io.netty:netty-handler-proxy:4.1.14.Final" level="project" />
74-
<orderEntry type="library" name="Maven: io.netty:netty-codec-socks:4.1.14.Final" level="project" />
75-
<orderEntry type="library" name="Maven: io.netty:netty-transport-native-epoll:linux-x86_64:4.1.14.Final" level="project" />
76-
<orderEntry type="library" name="Maven: io.netty:netty-common:4.1.14.Final" level="project" />
77-
<orderEntry type="library" name="Maven: io.netty:netty-transport-native-unix-common:4.1.14.Final" level="project" />
78-
<orderEntry type="library" name="Maven: io.netty:netty-transport-native-kqueue:osx-x86_64:4.1.14.Final" level="project" />
79-
<orderEntry type="library" name="Maven: org.slf4j:slf4j-log4j12:1.7.5" level="project" />
90+
<orderEntry type="library" name="Maven: commons-io:commons-io:2.6" level="project" />
91+
<orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.25" level="project" />
92+
<orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.60" level="project" />
93+
<orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.60" level="project" />
94+
<orderEntry type="library" name="Maven: io.netty:netty-codec-http:4.1.31.Final" level="project" />
95+
<orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.31.Final" level="project" />
96+
<orderEntry type="library" name="Maven: io.netty:netty-handler-proxy:4.1.31.Final" level="project" />
97+
<orderEntry type="library" name="Maven: io.netty:netty-codec-socks:4.1.31.Final" level="project" />
98+
<orderEntry type="library" name="Maven: io.netty:netty-transport-native-epoll:linux-x86_64:4.1.31.Final" level="project" />
99+
<orderEntry type="library" name="Maven: io.netty:netty-transport-native-kqueue:osx-x86_64:4.1.31.Final" level="project" />
100+
<orderEntry type="library" name="Maven: org.slf4j:slf4j-log4j12:2.0.0-alpha1" level="project" />
80101
<orderEntry type="library" name="Maven: log4j:log4j:1.2.17" level="project" />
81-
<orderEntry type="library" name="Maven: redis.clients:jedis:2.9.0" level="project" />
82-
<orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.4.2" level="project" />
83-
<orderEntry type="library" name="Maven: org.bstats:bstats-bungeecord:1.2" level="project" />
102+
<orderEntry type="library" name="Maven: redis.clients:jedis:3.2.0" level="project" />
103+
<orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.6.2" level="project" />
104+
<orderEntry type="library" name="Maven: org.bstats:bstats-bungeecord:1.7" level="project" />
84105
</component>
85106
</module>

‎pom.xml‎

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

77
<groupId>de.craftmania</groupId>
88
<artifactId>DockerizedCraft</artifactId>
9-
<version>0.2.2</version>
9+
<version>0.2.3</version>
1010

1111
<distributionManagement>
1212
<repository>

‎src/main/java/de/craftmania/dockerizedcraft/container/inspector/kubernetes/KubernetesContainerInspector.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
package de.craftmania.dockerizedcraft.container.inspector.kubernetes;
2+
23
import de.craftmania.dockerizedcraft.container.inspector.IContainerInspector;
3-
import io.fabric8.kubernetes.client.Config;
4-
import io.fabric8.kubernetes.client.DefaultKubernetesClient;
5-
import io.fabric8.kubernetes.client.KubernetesClient;
4+
import io.fabric8.kubernetes.client.*;
65

76
import net.md_5.bungee.api.ProxyServer;
87
import net.md_5.bungee.config.Configuration;
@@ -29,7 +28,7 @@ public void runContainerInspection() {
2928
public void runContainerListener() {
3029
this.logger.info("[Kubernetes Container Inspector] Running listener.");
3130
String namespace = configuration.getString("kubernetes.namespace");
32-
if(namespace == null ||namespace.isEmpty()) this.logger.severe("kubernetes.namespace not set.");
33-
this.client.pods().inNamespace(namespace).watch(new PodWatcher(proxyServer, logger, configuration));
31+
if (namespace == null || namespace.isEmpty()) this.logger.severe("kubernetes.namespace not set.");
32+
this.client.pods().inNamespace(namespace).watch(new PodWatcher(proxyServer, logger, configuration, client, namespace));
3433
}
3534
}

0 commit comments

Comments
 (0)