Fix #32496: use proxyId in k8s service name

Author: LEDfan

src/main/java/eu/openanalytics/containerproxy/backend/kubernetes/KubernetesBackend.java

@@ -34,8 +34,10 @@
 import eu.openanalytics.containerproxy.model.runtime.ProxyStartupLog;
 import eu.openanalytics.containerproxy.model.runtime.runtimevalues.BackendContainerNameKey;
 import eu.openanalytics.containerproxy.model.runtime.runtimevalues.ContainerImageKey;
+import eu.openanalytics.containerproxy.model.runtime.runtimevalues.ContainerIndexKey;
 import eu.openanalytics.containerproxy.model.runtime.runtimevalues.InstanceIdKey;
 import eu.openanalytics.containerproxy.model.runtime.runtimevalues.ProxiedAppKey;
+import eu.openanalytics.containerproxy.model.runtime.runtimevalues.ProxyIdKey;
 import eu.openanalytics.containerproxy.model.runtime.runtimevalues.RuntimeValue;
 import eu.openanalytics.containerproxy.model.runtime.runtimevalues.RuntimeValueKey;
 import eu.openanalytics.containerproxy.model.runtime.runtimevalues.RuntimeValueKeyRegistry;
@@ -368,7 +370,7 @@ public Proxy startContainer(Authentication user, Container initialContainer, Con
                         .withApiVersion(apiVersion)
                         .withKind("Service")
                         .withNewMetadata()
-                        .withName("sp-service-" + containerId)
+                        .withName(getServiceName(proxy, initialContainer))
                         .withLabels(serviceLabels)
                         .endMetadata()
                         .withNewSpec()
@@ -637,7 +639,7 @@ protected void doStopProxy(Proxy proxy) {
 
             if (!isUseInternalNetwork()) {
                 // delete service when not using internal network
-                Service service = kubeClient.services().inNamespace(podInfo.get().getFirst()).withName(getServiceName(container)).get();
+                Service service = kubeClient.services().inNamespace(podInfo.get().getFirst()).withName(getServiceName(proxy, container)).get();
                 if (service != null) {
                     kubeClient.resource(service).withGracePeriod(0).delete();
                 }
@@ -729,9 +731,12 @@ public List<ExistingContainerInfo> scanExistingContainers() {
                     continue;
                 }
 
+                String proxyId = runtimeValues.get(ProxyIdKey.inst).getObject();
+                Integer containerIndex = runtimeValues.get(ContainerIndexKey.inst).getObject();
+
                 Map<Integer, Integer> portBindings = new HashMap<>();
                 if (!isUseInternalNetwork()) {
-                    Service service = kubeClient.services().inNamespace(namespace).withName("sp-service-" + containerId).get();
+                    Service service = kubeClient.services().inNamespace(namespace).withName("sp-service-" + proxyId + "-" + containerIndex).get();
                     if (service == null) {
                         log.warn("Ignoring container {} because it has no associated service", containerId);
                         continue;
@@ -783,8 +788,8 @@ private Optional<Pair<String, String>> getPodInfo(Container container) {
         return Optional.of(Pair.of(tmp[0], tmp[1]));
     }
 
-    private String getServiceName(Container container) {
-        return "sp-service-" + container.getId();
+    private String getServiceName(Proxy proxy, Container container) {
+        return "sp-service-" + proxy.getId() + "-" + container.getIndex();
     }
 
     private Optional<Pod> getPod(Container container) {

src/test/java/eu/openanalytics/containerproxy/test/proxy/TestIntegrationOnKube.java

@@ -98,7 +98,7 @@ public void launchProxy() {
             Assertions.assertEquals(1, serviceList.getItems().size());
             Service service = serviceList.getItems().get(0);
             Assertions.assertEquals(k8s.namespace, service.getMetadata().getNamespace());
-            Assertions.assertEquals("sp-service-" + containerId, service.getMetadata().getName());
+            Assertions.assertEquals("sp-service-" + proxy.getId() + "-0", service.getMetadata().getName());
             Assertions.assertEquals(containerId, service.getSpec().getSelector().get("app"));
             Assertions.assertEquals(1, service.getSpec().getPorts().size());
             Assertions.assertEquals(Integer.valueOf(3838), service.getSpec().getPorts().get(0).getTargetPort().getIntVal());
@@ -332,7 +332,7 @@ public void launchProxyWithPodPatches() {
                 Assertions.assertEquals(1, serviceList.getItems().size());
                 Service service = serviceList.getItems().get(0);
                 Assertions.assertEquals(k8s.overriddenNamespace, service.getMetadata().getNamespace());
-                Assertions.assertEquals("sp-service-" + containerId, service.getMetadata().getName());
+                Assertions.assertEquals("sp-service-" + proxy.getId() + "-0", service.getMetadata().getName());
                 Assertions.assertEquals(containerId, service.getSpec().getSelector().get("app"));
                 Assertions.assertEquals(1, service.getSpec().getPorts().size());
                 Assertions.assertEquals(Integer.valueOf(3838), service.getSpec().getPorts().get(0).getTargetPort().getIntVal());
@@ -1107,7 +1107,7 @@ public void advancedRuntimeLabels() {
             Assertions.assertEquals(1, serviceList.getItems().size());
             Service service = serviceList.getItems().get(0);
             Assertions.assertEquals(k8s.namespace, service.getMetadata().getNamespace());
-            Assertions.assertEquals("sp-service-" + containerId, service.getMetadata().getName());
+            Assertions.assertEquals("sp-service-" + proxy.getId() + "-0", service.getMetadata().getName());
             Assertions.assertEquals(containerId, service.getSpec().getSelector().get("app"));
             Assertions.assertEquals(1, service.getSpec().getPorts().size());
             Assertions.assertEquals(Integer.valueOf(3838), service.getSpec().getPorts().get(0).getTargetPort().getIntVal());