Commit a7765ba0 authored by mvdbeek's avatar mvdbeek
Browse files

Merge branch 'release_19.09' into release_20.01

parents 999a2c3f 82b06aaf

lib/galaxy/jobs/runners/kubernetes.py

+2 −2
Original line number Diff line number Diff line
@@ -66,8 +66,8 @@ class KubernetesJobRunner(AsynchronousJobRunner): 
            k8s_default_limits_cpu=dict(map=str, default=None),

            k8s_default_limits_memory=dict(map=str, default=None),

            k8s_cleanup_job=dict(map=str, valid=lambda s: s in {"onsuccess", "always", "never"}, default="always"),

            k8s_pod_retries=dict(map=int, valid=lambda x: int >= 0, default=3),

            k8s_pod_retrials=dict(map=int, valid=lambda x: int >= 0, default=3),

            k8s_pod_retries=dict(map=int, valid=lambda x: int(x) >= 0, default=3),

            k8s_pod_retrials=dict(map=int, valid=lambda x: int(x) >= 0, default=3),

            k8s_walltime_limit=dict(map=int, valid=lambda x: int(x) >= 0, default=172800))



        if 'runner_param_specs' not in kwargs: