starlingx
/
config
Code Issues Proposed changes

Merge "Remove support for ignoring k8s isolated CPUs in sysinv"

This commit is contained in:
Zuul 2024-02-27 20:47:11 +00:00 committed by Gerrit Code Review
parent 7cb1c6f0b8 e276cac428
commit 16589b9828
2 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sysinv/sysinv/sysinv/sysinv/common/constants.py
View File

@ -2100,7 +2100,6 @@ SRIOV_LABEL = 'sriov=enabled'
SRIOVDP_LABEL = 'sriovdp=enabled'
KUBE_TOPOLOGY_MANAGER_LABEL = 'kube-topology-mgr-policy'
KUBE_CPU_MANAGER_LABEL = 'kube-cpu-mgr-policy'
KUBE_IGNORE_ISOL_CPU_LABEL = 'kube-ignore-isol-cpus=enabled'
KUBE_POWER_MANAGER_LABEL = 'power-management'
# Accepted label values

18
sysinv/sysinv/sysinv/sysinv/puppet/kubernetes.py
View File

@ -566,21 +566,9 @@ class KubernetesPuppet(base.BasePuppet):
# to pass as options to kubelet
k8s_platform_cpuset = utils.format_range_set(platform_cpuset)
# determine whether to reserve isolated CPUs
reserve_isolcpus = True
labels = self.dbapi.label_get_by_host(host.uuid)
for l in labels:
if (constants.KUBE_IGNORE_ISOL_CPU_LABEL ==
str(l.label_key) + '=' + str(l.label_value)):
reserve_isolcpus = False
break
if reserve_isolcpus:
k8s_all_reserved_cpuset = utils.format_range_set(platform_cpuset |
vswitch_cpuset |
isol_cpuset)
else:
k8s_all_reserved_cpuset = utils.format_range_set(platform_cpuset |
vswitch_cpuset)
k8s_all_reserved_cpuset = utils.format_range_set(platform_cpuset |
vswitch_cpuset |
isol_cpuset)
# determine platform reserved memory
k8s_reserved_mem = 0