From 0c917caa2aa2fd78f4655015c5c61a175296d8a6 Mon Sep 17 00:00:00 2001 From: fedora Date: Wed, 19 May 2021 09:47:58 -0400 Subject: [PATCH] --- Adding AWX_CONTAINER_GROUP_POD_LAUNCH_TIMEOUT in defaults.py --- Passing this parameter in receptor_params in AWXReceptorJob class --- Removed AWX_CONTAINER_GROUP_POD_LAUNCH_RETRIES from defaults.py as it was not being used anywhere --- Removed AWX_CONTAINER_GROUP_POD_LAUNCH_RETRY_DELAY from defaults.py as it was not being used anywhere --- awx/main/tasks.py | 1 + awx/settings/defaults.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/awx/main/tasks.py b/awx/main/tasks.py index 7642dd6bb2..ece5455693 100644 --- a/awx/main/tasks.py +++ b/awx/main/tasks.py @@ -3017,6 +3017,7 @@ class AWXReceptorJob: receptor_params = { "secret_kube_pod": spec_yaml, + "pod_pending_timeout": getattr(settings, 'AWX_CONTAINER_GROUP_POD_PENDING_TIMEOUT', "5m"), } if self.credential: diff --git a/awx/settings/defaults.py b/awx/settings/defaults.py index 5d1a3b1dd6..ea3427ee8c 100644 --- a/awx/settings/defaults.py +++ b/awx/settings/defaults.py @@ -70,9 +70,9 @@ IS_K8S = False RECEPTOR_RELEASE_WORK = True AWX_CONTAINER_GROUP_K8S_API_TIMEOUT = 10 -AWX_CONTAINER_GROUP_POD_LAUNCH_RETRIES = 100 -AWX_CONTAINER_GROUP_POD_LAUNCH_RETRY_DELAY = 5 AWX_CONTAINER_GROUP_DEFAULT_NAMESPACE = os.getenv('MY_POD_NAMESPACE', 'default') +# Timeout when waiting for pod to enter running state. If the pod is still in pending state , it will be terminated. Valid time units are "s", "m", "h". Example : "5m" , "10s". +AWX_CONTAINER_GROUP_POD_PENDING_TIMEOUT = "5m" # Internationalization # https://docs.djangoproject.com/en/dev/topics/i18n/