Merge branch 'release/0.8.6'

LEDfan · LEDfan · commit e664c3efd3d5 · 2020-12-17T10:34:25.000+01:00
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>eu.openanalytics</groupId>
 	<artifactId>containerproxy</artifactId>
-	<version>0.8.6-SNAPSHOT</version>
+	<version>0.8.6</version>
 	<name>ContainerProxy</name>
 	<packaging>jar</packaging>
 
diff --git a/src/main/java/eu/openanalytics/containerproxy/backend/kubernetes/KubernetesBackend.java b/src/main/java/eu/openanalytics/containerproxy/backend/kubernetes/KubernetesBackend.java
@@ -286,6 +286,9 @@ protected Container startContainer(ContainerSpec spec, Proxy proxy) throws Excep
 			}
 		, maxTries, 1000);
 		if (!Readiness.isReady(kubeClient.resource(startedPod).fromServer().get())) {
+			Pod pod = kubeClient.resource(startedPod).fromServer().get();
+			container.getParameters().put(PARAM_POD, pod);
+			proxy.getContainers().add(container);
 			throw new ContainerProxyException("Container did not become ready in time");
 		}
 		Pod pod = kubeClient.resource(startedPod).fromServer().get();

Original file line number	Diff line number	Diff line change
`@@ -286,6 +286,9 @@ protected Container startContainer(ContainerSpec spec, Proxy proxy) throws Excep`
`286`	`286`	`}`
`287`	`287`	`, maxTries, 1000);`
`288`	`288`	`if (!Readiness.isReady(kubeClient.resource(startedPod).fromServer().get())) {`
	`289`	`+ Pod pod = kubeClient.resource(startedPod).fromServer().get();`
	`290`	`+ container.getParameters().put(PARAM_POD, pod);`
	`291`	`+ proxy.getContainers().add(container);`
`289`	`292`	`throw new ContainerProxyException("Container did not become ready in time");`
`290`	`293`	`}`
`291`	`294`	`Pod pod = kubeClient.resource(startedPod).fromServer().get();`