Merge pull request #4034 from jmchilton/k8_name_fixed

[17.05] Sanitize container names sending to Kubernetes.

lib/galaxy/jobs/runners/kubernetes.py

@@ -3,6 +3,7 @@
 """
 
 import logging
+import re
 from os import environ as os_environ
 
 from six import text_type
@@ -208,8 +209,12 @@ def __assemble_k8s_container_image_name(self, job_wrapper):
         return k8s_cont_image
 
     def __get_k8s_container_name(self, job_wrapper):
-        # TODO check if this is correct
-        return job_wrapper.job_destination.id
+        # These must follow a specific regex for Kubernetes.
+        raw_id = job_wrapper.job_destination.id
+        cleaned_id = re.sub("[^-a-z0-9]", "-", raw_id)
+        if cleaned_id.startswith("-") or cleaned_id.endswith("-"):
+            cleaned_id = "x%sx" % cleaned_id
+        return cleaned_id
 
     def check_watched_item(self, job_state):
         """Checks the state of a job already submitted on k8s. Job state is a AsynchronousJobState"""