Skip to content

Commit c5106a0

Browse files
committed
fix kubernetes deleting server from the list
1 parent fab77b4 commit c5106a0

File tree

2 files changed

+12
-5
lines changed

2 files changed

+12
-5
lines changed

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,12 +92,12 @@
9292
<dependency>
9393
<groupId>io.fabric8</groupId>
9494
<artifactId>kubernetes-client</artifactId>
95-
<version>4.8.0</version>
95+
<version>4.10.2</version>
9696
</dependency>
9797
<dependency>
9898
<groupId>com.github.docker-java</groupId>
9999
<artifactId>docker-java</artifactId>
100-
<version>3.2.0-rc-5</version>
100+
<version>3.1.5</version>
101101
<scope>compile</scope>
102102
</dependency>
103103
<dependency>

src/main/java/de/craftmania/dockerizedcraft/container/inspector/kubernetes/PodWatcher.java

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
import io.fabric8.kubernetes.client.KubernetesClientException;
77
import io.fabric8.kubernetes.api.model.EnvVar;
88
import java.util.logging.Logger;
9+
10+
import com.sun.corba.se.spi.orbutil.fsm.Action;
11+
912
import java.net.InetAddress;
1013
import java.util.*;
1114

@@ -27,10 +30,13 @@ public void eventReceived(Action action, Pod resource) {
2730
logger.info("labels: "+labels.toString());
2831
if(!labels.containsKey("dockerizedcraft/enabled") || !labels.get("dockerizedcraft/enabled").equals("true")) return;
2932

30-
String dockerAction = "stop";
31-
if(resource.getStatus().getPhase().equals("Running")){
33+
String dockerAction = "nothing";
34+
if(action.toString().equals("ADDED")){
3235
dockerAction = "start";
3336
}
37+
else if(action.toString().equals("DELETED")){
38+
dockerAction = "stop";
39+
}
3440

3541
ContainerEvent containerEvent = new ContainerEvent(resource.getMetadata().getName(), dockerAction);
3642
containerEvent.setName(resource.getMetadata().getName());
@@ -43,7 +49,8 @@ public void eventReceived(Action action, Pod resource) {
4349
logger.info("port: "+environmentVariables.get("SERVER_PORT"));
4450
containerEvent.setIp(InetAddress.getByName(resource.getStatus().getPodIP()));
4551
logger.info("ip: "+resource.getStatus().getPodIP());
46-
this.proxyServer.getPluginManager().callEvent(containerEvent);
52+
if (!dockerAction.equals("nothing"))
53+
this.proxyServer.getPluginManager().callEvent(containerEvent);
4754
}catch(java.net.UnknownHostException ex){
4855
logger.severe(ex.getMessage());
4956
}

0 commit comments

Comments
 (0)