Add more labels to launched pods

Author: LEDfan

src/main/java/eu/openanalytics/containerproxy/backend/AbstractContainerBackend.java

@@ -70,6 +70,11 @@ public abstract class AbstractContainerBackend implements IContainerBackend {
 	protected static final String ENV_VAR_USER_GROUPS = "SHINYPROXY_USERGROUPS";
 	protected static final String ENV_VAR_REALM_ID = "SHINYPROXY_REALM_ID";
 
+	protected static final String LABEL_PROXY_ID = "openanalytics.eu/sp-proxy-id";
+	protected static final String LABEL_USER_ID = "openanalytics.eu/sp-user-id";
+	protected static final String LABEL_PROXY_SPEC_ID = "openanalytics.eu/sp-spec-id";
+	protected static final String LABEL_STARTUP_TIMESTAMP = "openanalytics.eu/sp-proxy-startup-timestamp";
+
 	protected final Logger log = LogManager.getLogger(getClass());
 
 	private boolean useInternalNetwork;
@@ -126,9 +131,23 @@ public void startProxy(Proxy proxy) throws ContainerProxyException {
 	protected void doStartProxy(Proxy proxy) throws Exception {
 		for (ContainerSpec spec: proxy.getSpec().getContainerSpecs()) {
 			if (authBackend != null) authBackend.customizeContainer(spec);
+
+			// add labels need for App Recovery and maintenance
+			spec.addLabel(LABEL_PROXY_ID, proxy.getId());
+			spec.addLabel(LABEL_USER_ID, proxy.getUserId());
+			spec.addLabel(LABEL_PROXY_SPEC_ID, proxy.getSpec().getId());
+			spec.addLabel(LABEL_STARTUP_TIMESTAMP, String.valueOf(proxy.getStartupTimestamp()));
+
 			ExpressionAwareContainerSpec eSpec = new ExpressionAwareContainerSpec(spec, proxy, expressionResolver);
 			Container c = startContainer(eSpec, proxy);
 			c.setSpec(spec);
+			
+			// remove labels needed for App Recovery since they do not really belong to the spec
+			spec.removeLabel(LABEL_PROXY_ID);
+			spec.removeLabel(LABEL_USER_ID);
+			spec.removeLabel(LABEL_PROXY_SPEC_ID);
+			spec.removeLabel(LABEL_STARTUP_TIMESTAMP);
+			
 			proxy.getContainers().add(c);
 		}
 	}

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

@@ -109,7 +109,7 @@ public class KubernetesBackend extends AbstractContainerBackend {
 
 	private static final String SECRET_KEY_REF = "secretKeyRef";
 
-	private static final String LABEL_PROXIED_APP = "openanalytics.eu/containerproxy-proxied-app";
+	private static final String LABEL_PROXIED_APP = "openanalytics.eu/containerproxy-proxied-app"; // TODO rename to "sp-proxied-app" ?
 	private static final String LABEL_INSTANCE = "openanalytics.eu/sp-instance";
 
 

src/main/java/eu/openanalytics/containerproxy/model/spec/ContainerSpec.java

@@ -133,9 +133,24 @@ public Map<String, String> getLabels() {
 	public void setLabels(Map<String, String> labels) {
 		this.labels = labels;
 	}
+	
+	public void addLabel(String key, String value) {
+		if (this.labels.containsKey(key)) {
+			throw new IllegalStateException("Cannot add duplicate label with key " + key);
+		} else {
+			labels.put(key, value);
+		}
+	}
+	
+	public void removeLabel(String key) {
+		labels.remove(key);
+	}
+
+
 	public Map<String, String> getSettings() {
 		return settings;
 	}
+	
 	public void setSettings(Map<String, String> settings) {
 		this.settings = settings;
 	}