Default to 4GB memory for k8s builders
This commit is contained in:
parent
9def2cf055
commit
631ad0422d
2 changed files with 4 additions and 4 deletions
|
@ -323,18 +323,18 @@ class KubernetesExecutor(BuilderExecutor):
|
||||||
return '%s/%s' % (self._jobs_path(), build_uuid)
|
return '%s/%s' % (self._jobs_path(), build_uuid)
|
||||||
|
|
||||||
def _job_resource(self, build_uuid, user_data, coreos_channel='stable'):
|
def _job_resource(self, build_uuid, user_data, coreos_channel='stable'):
|
||||||
vm_memory_limit = self.executor_config.get('VM_MEMORY_LIMIT', '8G')
|
vm_memory_limit = self.executor_config.get('VM_MEMORY_LIMIT', '4G')
|
||||||
vm_volume_size = self.executor_config.get('VOLUME_SIZE', '32G')
|
vm_volume_size = self.executor_config.get('VOLUME_SIZE', '32G')
|
||||||
|
|
||||||
# Max values for this container
|
# Max values for this container
|
||||||
container_limits = {
|
container_limits = {
|
||||||
'memory' : self.executor_config.get('CONTAINER_MEMORY_LIMIT', '8Gi'),
|
'memory' : self.executor_config.get('CONTAINER_MEMORY_LIMIT', '4Gi'),
|
||||||
'cpu' : self.executor_config.get('CONTAINER_CPU_LIMIT', "2"),
|
'cpu' : self.executor_config.get('CONTAINER_CPU_LIMIT', "2"),
|
||||||
}
|
}
|
||||||
|
|
||||||
# Minimum acceptable free resources for this container to "fit" in a quota
|
# Minimum acceptable free resources for this container to "fit" in a quota
|
||||||
container_requests = {
|
container_requests = {
|
||||||
'memory' : self.executor_config.get('CONTAINER_MEMORY_REQUEST', '8Gi'),
|
'memory' : self.executor_config.get('CONTAINER_MEMORY_REQUEST', '4Gi'),
|
||||||
'cpu' : self.executor_config.get('CONTAINER_CPU_REQUEST', "2"),
|
'cpu' : self.executor_config.get('CONTAINER_CPU_REQUEST', "2"),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
VM_VOLUME_SIZE="${VM_VOLUME_SIZE:-32G}"
|
VM_VOLUME_SIZE="${VM_VOLUME_SIZE:-32G}"
|
||||||
VM_MEMORY="${VM_MEMORY:-8G}"
|
VM_MEMORY="${VM_MEMORY:-4G}"
|
||||||
|
|
||||||
set -e
|
set -e
|
||||||
set -x
|
set -x
|
||||||
|
|
Reference in a new issue