automatically detect dynamic-hostports-k8s + bump version

Author: unixfox

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>de.craftmania</groupId>
     <artifactId>DockerizedCraft</artifactId>
-    <version>0.2.7</version>
+    <version>0.2.8</version>
 
     <distributionManagement>
         <repository>

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

@@ -28,8 +28,7 @@ public void runContainerInspection() {
     public void runContainerListener() {
         this.logger.info("[Kubernetes Container Inspector] Running listener.");
         String namespace = configuration.getString("kubernetes.namespace");
-        Boolean hostport = configuration.getBoolean("kubernetes.hostport");
         if (namespace == null || namespace.isEmpty()) this.logger.severe("kubernetes.namespace not set.");
-        this.client.pods().inNamespace(namespace).watch(new PodWatcher(proxyServer, logger, configuration, client, namespace, hostport));
+        this.client.pods().inNamespace(namespace).watch(new PodWatcher(proxyServer, logger, configuration, client, namespace));
     }
 }

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

@@ -25,17 +25,15 @@ public class PodWatcher implements Watcher<Pod> {
     private Boolean debug;
     private KubernetesClient client;
     private String namespace;
-    private Boolean hostport;
 
     PodWatcher(ProxyServer proxyServer, Logger logger, Configuration configuration, KubernetesClient client,
-            String namespace, Boolean hostport) {
+            String namespace) {
         this.proxyServer = proxyServer;
         this.logger = logger;
         this.configuration = configuration;
         this.debug = configuration.getBoolean("debug");
         this.client = client;
         this.namespace = namespace;
-        this.hostport = hostport;
     }
 
     @Override
@@ -51,6 +49,7 @@ public void eventReceived(Action action, Pod resource) {
             }
 
             Map<String, String> labels = resource.getMetadata().getLabels();
+            Map<String, String> annotations = resource.getMetadata().getAnnotations();
             if (labels != null) {
                 if (this.debug) {
                     logger.info("[Kubernetes Container Inspector] labels: " + labels.toString());
@@ -75,8 +74,8 @@ public void eventReceived(Action action, Pod resource) {
             Map<String, String> environmentVariables = new HashMap<>();
             for (EnvVar i : resource.getSpec().getContainers().get(0).getEnv())
                 environmentVariables.put(i.getName(), i.getValue());
-            containerEvent.setEnvironmentVariables(environmentVariables);
-            if (hostport) {
+            if (annotations.toString().contains("dynamic-hostports.k8s")) {
+                environmentVariables.remove("SERVER_PORT");
                 String nodeName = resource.getSpec().getNodeName();
                 if (nodeName == null)
                     return;
@@ -90,7 +89,7 @@ public void eventReceived(Action action, Pod resource) {
                     ip = nodeExternalAddresses.get(0).getAddress();
                 else
                     ip = nodeInternalAddresses.get(0).getAddress();
-                String port = resource.getMetadata().getAnnotations().get("dynamic-hostports.k8s/25565");
+                String port = annotations.get("dynamic-hostports.k8s/25565");
                 if (this.debug) {
                     logger.info("[Kubernetes Container Inspector] env:" + environmentVariables);
                     logger.info("[Kubernetes Container Inspector] port: " + port);
@@ -115,6 +114,7 @@ public void eventReceived(Action action, Pod resource) {
                 containerEvent.setPort(Integer.parseInt(environmentVariables.get("SERVER_PORT")));
                 containerEvent.setIp(InetAddress.getByName(resource.getStatus().getPodIP()));
             }
+            containerEvent.setEnvironmentVariables(environmentVariables);
             if (!dockerAction.equals("nothing"))
                 this.proxyServer.getPluginManager().callEvent(containerEvent);
         } catch (java.net.UnknownHostException ex) {
@@ -128,6 +128,6 @@ public void onClose(KubernetesClientException cause) {
         logger.warning("[Kubernetes Container Inspector] Watcher close due to " + cause);
         logger.warning("[Kubernetes Container Inspector] Rewatching resources...");
         client.pods().inNamespace(namespace)
-                .watch(new PodWatcher(proxyServer, logger, configuration, client, namespace, hostport));
+                .watch(new PodWatcher(proxyServer, logger, configuration, client, namespace));
     }
 }

src/main/resources/container-inspector.yml

@@ -39,5 +39,4 @@ docker:
 
 kubernetes:
   # The namespace that bungeecord and all minecraft servers reside in
-  namespace: minecraft
-  hostport: true
+  namespace: minecraft