github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Usernetes additional changes

k3s-v1.13.4
Darren Shepherd 2019-03-08 15:25:46 -07:00
parent 6573b80097
commit 18d5c9f001
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/kubelet/cm/qos_container_manager_linux.go
View File

@ -123,7 +123,11 @@ func (m *qosContainerManagerImpl) Start(getNodeAllocatable func() v1.ResourceLis
} else {
// to ensure we actually have the right state, we update the config on startup
if err := cm.Update(containerConfig); err != nil {
return fmt.Errorf("failed to update top level %v QOS cgroup : %v", qosClass, err)
if rsystem.RunningInUserNS() {
klog.Errorf("failed to update top level %v QOS cgroup : %v", qosClass, err)
} else {
return fmt.Errorf("failed to update top level %v QOS cgroup : %v", qosClass, err)
}
}
}
}