Unverified Commit b4b1defd authored by Nuwan Goonasekera's avatar Nuwan Goonasekera Committed by GitHub
Browse files

Merge pull request #15238 from pcm32/patch-13 

[23.2] Enable job resubmissions in k8s runner
parents 7f057c93 250be5db

lib/galaxy/dependencies/__init__.py

+1 −1
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ class ConditionalDependencies: 
    def check_pbs_python(self):

        return "galaxy.jobs.runners.pbs:PBSJobRunner" in self.job_runners



    def check_pykube(self):

    def check_pykube_ng(self):

        return "galaxy.jobs.runners.kubernetes:KubernetesJobRunner" in self.job_runners or which("kubectl")



    def check_chronos_python(self):

lib/galaxy/dependencies/conditional-requirements.txt

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ custos-sdk 
chronos-python==1.2.1



# Kubernetes job runner

pykube==0.15.0

pykube-ng==21.3.0



# Synnefo / Pithos+ object store client

kamaki

lib/galaxy/jobs/runners/kubernetes.py

+195 −26

File changed.

Preview size limit exceeded, changes collapsed.

lib/galaxy/jobs/runners/util/pykube_util.py

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ log = logging.getLogger(__name__) 


DEFAULT_JOB_API_VERSION = "batch/v1"

DEFAULT_SERVICE_API_VERSION = "v1"

DEFAULT_INGRESS_API_VERSION = "extensions/v1beta1"

DEFAULT_INGRESS_API_VERSION = "networking.k8s.io/v1"

DEFAULT_NAMESPACE = "default"

INSTANCE_ID_INVALID_MESSAGE = (

    "Galaxy instance [%s] is either too long "

lib/galaxy/authnz/custos_authnz.py

+1 −1

File changed.

Contains only whitespace changes.