External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-24 04:15:02 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11559 from kdelee/pending_container_group_jobs_take2

Browse Source 
Add resource requests to default podspec
This commit is contained in:
Elijah DeLee
2022-01-20 09:54:20 -05:00
committed by GitHub
parent add54bfd0b 987924cbda
commit faba64890e
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/main/tasks/receptor.py
View File

@@ -389,7 +389,7 @@ class AWXReceptorJob:
self.task.instance.result_traceback = detail self.task.instance.result_traceback = detail
self.task.instance.save(update_fields=['result_traceback']) self.task.instance.save(update_fields=['result_traceback'])
else: else:
logger.warn(f'No result details or output from {self.task.instance.log_format}, status:\n{unit_status}') logger.warn(f'No result details or output from {self.task.instance.log_format}, status:\n{state_name}')
except Exception: except Exception:
raise RuntimeError(detail) raise RuntimeError(detail)

1
awx/main/utils/execution_environments.py
View File

@@ -38,6 +38,7 @@ def get_default_pod_spec():
"image": ee.image, "image": ee.image,
"name": 'worker', "name": 'worker',
"args": ['ansible-runner', 'worker', '--private-data-dir=/runner'], "args": ['ansible-runner', 'worker', '--private-data-dir=/runner'],
"resources": {"requests": {"cpu": "250m", "memory": "100Mi"}},
} }
], ],
}, },

2
awx/settings/defaults.py
View File

@@ -71,7 +71,7 @@ IS_K8S = False
AWX_CONTAINER_GROUP_K8S_API_TIMEOUT = 10 AWX_CONTAINER_GROUP_K8S_API_TIMEOUT = 10
AWX_CONTAINER_GROUP_DEFAULT_NAMESPACE = os.getenv('MY_POD_NAMESPACE', 'default') 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". # 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" AWX_CONTAINER_GROUP_POD_PENDING_TIMEOUT = "2h"
# Internationalization # Internationalization
# https://docs.djangoproject.com/en/dev/topics/i18n/ # https://docs.djangoproject.com/en/dev/topics/i18n/