mirror of
https://github.com/kubernetes/kubernetes.git
synced 2026-02-03 20:40:26 -05:00
e2e: node: linter fix
fix linter suggestions. Signed-off-by: Francesco Romani <fromani@redhat.com>
This commit is contained in:
parent
e839adafb7
commit
8612c57d21
2 changed files with 4 additions and 4 deletions
|
|
@ -2681,7 +2681,7 @@ type ctnAttribute struct {
|
|||
func makeCPUManagerPod(podName string, ctnAttributes []ctnAttribute) *v1.Pod {
|
||||
var containers []v1.Container
|
||||
for _, ctnAttr := range ctnAttributes {
|
||||
cpusetCmd := fmt.Sprintf("grep Cpus_allowed_list /proc/self/status | cut -f2 && sleep 1d")
|
||||
cpusetCmd := "grep Cpus_allowed_list /proc/self/status | cut -f2 && sleep 1d"
|
||||
ctn := v1.Container{
|
||||
Name: ctnAttr.ctnName,
|
||||
Image: busyboxImage,
|
||||
|
|
|
|||
|
|
@ -1564,7 +1564,7 @@ func runMultipleGuNonGuPods(ctx context.Context, f *framework.Framework, cpuCap
|
|||
cpuListString = "0"
|
||||
if cpuAlloc > 2 {
|
||||
cset = mustParseCPUSet(fmt.Sprintf("0-%d", cpuCap-1))
|
||||
cpuListString = fmt.Sprintf("%s", cset.Difference(cpuset.New(cpu1)))
|
||||
cpuListString = cset.Difference(cpuset.New(cpu1)).String()
|
||||
}
|
||||
expAllowedCPUsListRegex = fmt.Sprintf("^%s\n$", cpuListString)
|
||||
err = e2epod.NewPodClient(f).MatchContainerOutput(ctx, pod2.Name, pod2.Spec.Containers[0].Name, expAllowedCPUsListRegex)
|
||||
|
|
@ -1603,14 +1603,14 @@ func runMultipleCPUGuPod(ctx context.Context, f *framework.Framework) {
|
|||
if !isHTEnabled() && len(cpuList) > 2 {
|
||||
cset = mustParseCPUSet(fmt.Sprintf("%d-%d", cpuList[1], cpuList[2]))
|
||||
}
|
||||
cpuListString = fmt.Sprintf("%s", cset)
|
||||
cpuListString = cset.String()
|
||||
}
|
||||
} else if isHTEnabled() {
|
||||
cpuListString = "2-3"
|
||||
cpuList = mustParseCPUSet(getCPUSiblingList(0)).List()
|
||||
if cpuList[1] != 1 {
|
||||
cset = mustParseCPUSet(getCPUSiblingList(1))
|
||||
cpuListString = fmt.Sprintf("%s", cset)
|
||||
cpuListString = cset.String()
|
||||
}
|
||||
}
|
||||
expAllowedCPUsListRegex = fmt.Sprintf("^%s\n$", cpuListString)
|
||||
|
|
|
|||
Loading…
Reference in a new issue