From 488baee52a02efd1a4985fe4ad27b7208f399036 Mon Sep 17 00:00:00 2001 From: Nuwan Goonasekera <2070605+nuwang@users.noreply.github.com> Date: Fri, 2 Oct 2020 17:13:42 +0530 Subject: [PATCH] Use generated uuid instead of galaxy job id for k8s job name Co-authored-by: Marius van den Beek --- lib/galaxy/jobs/runners/util/pykube_util.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/lib/galaxy/jobs/runners/util/pykube_util.py b/lib/galaxy/jobs/runners/util/pykube_util.py index a4db31b70f6..b64e98ec519 100644 --- a/lib/galaxy/jobs/runners/util/pykube_util.py +++ b/lib/galaxy/jobs/runners/util/pykube_util.py @@ -1,9 +1,7 @@ """Interface layer for pykube library shared between Galaxy and Pulsar.""" import logging import os -import random import re -import string import uuid try: @@ -59,9 +57,7 @@ def produce_unique_k8s_job_name(app_prefix=None, instance_id=None, job_id=None): if instance_id and len(instance_id) > 0: job_name += "%s-" % instance_id - unique_id = ''.join(random.choices(string.ascii_lowercase, k=4)) - - return job_name + job_id + "-" + unique_id + return "{}{}-{}".format(job_name, job_id, uuid.uuid4()) def pull_policy(params):