fix kubernetes deleting server from the list

bolt-rip · Jul 9, 2020 · c5106a0 · c5106a0
1 parent fab77b4
commit c5106a0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -92,12 +92,12 @@
         <dependency>
             <groupId>io.fabric8</groupId>
             <artifactId>kubernetes-client</artifactId>
-            <version>4.8.0</version>
+            <version>4.10.2</version>
         </dependency>
         <dependency>
             <groupId>com.github.docker-java</groupId>
             <artifactId>docker-java</artifactId>
-            <version>3.2.0-rc-5</version>
+            <version>3.1.5</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

diff --git a/src/main/java/de/craftmania/dockerizedcraft/container/inspector/kubernetes/PodWatcher.java b/src/main/java/de/craftmania/dockerizedcraft/container/inspector/kubernetes/PodWatcher.java
@@ -6,6 +6,9 @@
 import io.fabric8.kubernetes.client.KubernetesClientException;
 import io.fabric8.kubernetes.api.model.EnvVar;
 import java.util.logging.Logger;
+
+import com.sun.corba.se.spi.orbutil.fsm.Action;
+
 import java.net.InetAddress;
 import java.util.*;
 
@@ -27,10 +30,13 @@ public void eventReceived(Action action, Pod resource) {
             logger.info("labels: "+labels.toString());
             if(!labels.containsKey("dockerizedcraft/enabled") || !labels.get("dockerizedcraft/enabled").equals("true")) return;
 
-            String dockerAction = "stop";
-            if(resource.getStatus().getPhase().equals("Running")){
+            String dockerAction = "nothing";
+            if(action.toString().equals("ADDED")){
                 dockerAction = "start";
             }
+            else if(action.toString().equals("DELETED")){
+                dockerAction = "stop";
+            }
 
             ContainerEvent containerEvent = new ContainerEvent(resource.getMetadata().getName(), dockerAction);
             containerEvent.setName(resource.getMetadata().getName());
@@ -43,7 +49,8 @@ public void eventReceived(Action action, Pod resource) {
             logger.info("port: "+environmentVariables.get("SERVER_PORT"));
             containerEvent.setIp(InetAddress.getByName(resource.getStatus().getPodIP()));
             logger.info("ip: "+resource.getStatus().getPodIP());
-            this.proxyServer.getPluginManager().callEvent(containerEvent);
+            if (!dockerAction.equals("nothing"))
+                this.proxyServer.getPluginManager().callEvent(containerEvent);
         }catch(java.net.UnknownHostException ex){
             logger.severe(ex.getMessage());
         }