starlingx
/
config
Code Issues Proposed changes

kubelet does not start due to garbled cpulist 

This adds consistent quote wrapping around sysinv puppet hieradata
values containing complex cpulist or list of ranges.

Two new variables were introduced by commit
92828038b4 Enable --reserved-cpus option
in k8s v1.18.1.

platform::kubernetes::params::k8s_all_reserved_cpuset, and
platform::kubernetes::params::k8s_platform_cpuset.

Without the quotes, any value containing a comma gets interpreted
as octal without comma, this results in a strange invalid integer.
This leads to kubelet fail to start. and node will not come up.

This issue was more likely when multiple platform cores are reserved,
and hyperthreading is enabled, since that causes non-consecutive
integers specified in the reserved list.

Change-Id: I029d89cd8a6f1ca12078d9b86ae05e6660fa2af6
Closes-Bug: 1885316
Signed-off-by: Jim Gauld <james.gauld@windriver.com>
This commit is contained in:
Jim Gauld 2020-06-26 15:24:21 -04:00
parent 93be0c8d08
commit d6f0688a94
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -377,9 +377,9 @@ class KubernetesPuppet(base.BasePuppet):
'platform::kubernetes::params::k8s_nodeset':
"\"%s\"" % k8s_nodeset,
'platform::kubernetes::params::k8s_platform_cpuset':
k8s_platform_cpuset,
"\"%s\"" % k8s_platform_cpuset,
'platform::kubernetes::params::k8s_all_reserved_cpuset':
k8s_all_reserved_cpuset,
"\"%s\"" % k8s_all_reserved_cpuset,
'platform::kubernetes::params::k8s_reserved_mem':
k8s_reserved_mem,
})