starlingx
/
config
Code Issues Proposed changes

Merge "limit ingress CPU usage"

This commit is contained in:
Zuul 2019-08-02 18:41:30 +00:00 committed by Gerrit Code Review
parent 9acc76ed22 7cbff55d9a
commit fe6b926716
1 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
sysinv/sysinv/sysinv/sysinv/helm/ingress.py
View File

@ -29,11 +29,28 @@ class IngressHelm(base.BaseHelm):
}
def get_overrides(self, namespace=None):
limit_enabled, limit_cpus, limit_mem_mib = self._get_platform_res_limit()
overrides = {
common.HELM_NS_KUBE_SYSTEM: {
'pod': {
'replicas': {
'error_page': self._num_controllers()
},
'resources': {
'enabled': limit_enabled,
'ingress': {
'limits': {
'cpu': "%d000m" % (limit_cpus),
'memory': "%dMi" % (limit_mem_mib)
}
},
'error_pages': {
'limits': {
'cpu': "%d000m" % (limit_cpus),
'memory': "%dMi" % (limit_mem_mib)
}
}
}
},
'deployment': {
@ -49,6 +66,21 @@ class IngressHelm(base.BaseHelm):
'replicas': {
'ingress': self._num_controllers(),
'error_page': self._num_controllers()
},
'resources': {
'enabled': limit_enabled,
'ingress': {
'limits': {
'cpu': "%d000m" % (limit_cpus),
'memory': "%dMi" % (limit_mem_mib)
}
},
'error_pages': {
'limits': {
'cpu': "%d000m" % (limit_cpus),
'memory': "%dMi" % (limit_mem_mib)
}
}
}
}
}