15308555518/ kubekey
1
0
Fork 0
mirror of https://github.com/kubesphere/kubekey.git synced 2025-12-26 01:22:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1236 from tanguofu/master 

fix:  when use docker runtime , the `kk` check cgroup driver  wrong at the docker already deployed node
This commit is contained in:
KubeSphere CI Bot 2022-04-23 13:20:58 +08:00 committed by GitHub
parent d326bdb107 8bb495760f
commit b39e88cb41
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/kubernetes/templates/v1beta2/kubeadm_config.go
View File

@ -296,13 +296,13 @@ func GetKubeletCgroupDriver(runtime connector.Runtime, kubeConf *common.KubeConf
var cmd, kubeletCgroupDriver string
switch kubeConf.Cluster.Kubernetes.ContainerManager {
case common.Docker, "":
cmd = "docker info | grep 'Cgroup Driver' | awk -F': ' '{ print $2; }'"
cmd = "docker info | grep 'Cgroup Driver'"
case common.Crio:
cmd = "crio config | grep cgroup_manager | awk -F'= ' '{ print $2; }'"
cmd = "crio config | grep cgroup_manager"
case common.Conatinerd:
cmd = "containerd config dump | grep SystemdCgroup | awk -F'= ' '{ print $2; }'"
cmd = "containerd config dump | grep SystemdCgroup"
case common.Isula:
cmd = "isula info | grep 'Cgroup Driver' | awk -F': ' '{ print $2; }'"
cmd = "isula info | grep 'Cgroup Driver'"
default:
kubeletCgroupDriver = ""
}
@ -311,10 +311,12 @@ func GetKubeletCgroupDriver(runtime connector.Runtime, kubeConf *common.KubeConf
if err != nil {
return "", errors.Wrap(errors.WithStack(err), "Failed to get container runtime cgroup driver.")
}
if strings.Contains(checkResult, "systemd") || !strings.Contains(checkResult, "false") {
if strings.Contains(checkResult, "systemd") || strings.Contains(checkResult, "SystemdCgroup = true") {
kubeletCgroupDriver = "systemd"
} else {
} else if strings.Contains(checkResult, "cgroupfs") || strings.Contains(checkResult, "SystemdCgroup = false") {
kubeletCgroupDriver = "cgroupfs"
} else {
return "", errors.Errorf("Failed to get container runtime cgroup driver from %s by run %s", checkResult, cmd)
}
return kubeletCgroupDriver, nil
}