kubernetes
/
minikube
mirror of https://github.com/kubernetes/minikube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Move the user facing warning inside hasMemoryCgroup().

pull/10512/head
hetong07 2021-02-18 16:43:19 -08:00
parent e8c2a23398
commit 556a8d7930
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/drivers/kic/oci/oci.go
View File

@ -116,6 +116,7 @@ func hasMemoryCgroup() bool {
}
if _, err := os.Stat(memory); os.IsNotExist(err) {
klog.Warning("Your kernel does not support memory limit capabilities or the cgroup is not mounted.")
out.WarningT("Cgroup v2 does not allow setting memory, if you want to set memory, please modify your Grub as instructed in https://docs.docker.com/engine/install/linux-postinstall/#your-kernel-does-not-support-cgroup-swap-limit-capabilities")
memcg = false
}
}
@ -186,10 +187,6 @@ func CreateContainerNode(p CreateParams) error {
memcgSwap := hasMemorySwapCgroup()
memcg := hasMemoryCgroup()
if !memcgSwap || !memcg {
out.WarningT("Cgroup v2 does not allow setting memory, if you want to set memory, please modify your Grub as instructed in https://docs.docker.com/engine/install/linux-postinstall/#your-kernel-does-not-support-cgroup-swap-limit-capabilities")
}
// https://www.freedesktop.org/wiki/Software/systemd/ContainerInterface/
var virtualization string
if p.OCIBinary == Podman { // enable execing in /var