Skip to content

K
k3s
Commit 173a8608 authored by Darren Shepherd's avatar Darren Shepherd Committed by Erik Wilson
Browse files
Options

More usernetes patches

parent 0d6e3b06
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
pkg/kubelet/cm/qos_container_manager_linux.go
View file @ 173a8608
...@@ -119,10 +119,14 @@ func (m *qosContainerManagerImpl) Start(getNodeAllocatable func() v1.ResourceLis ...@@ -119,10 +119,14 @@ func (m *qosContainerManagerImpl) Start(getNodeAllocatable func() v1.ResourceLis
} else { } else {
// to ensure we actually have the right state, we update the config on startup // to ensure we actually have the right state, we update the config on startup
if err := cm.Update(containerConfig); err != nil { if err := cm.Update(containerConfig); err != nil {
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) return fmt.Errorf("failed to update top level %v QOS cgroup : %v", qosClass, err)
} }
} }
} }
}
// Store the top level qos container names // Store the top level qos container names
m.qosContainersInfo = QOSContainersInfo{ m.qosContainersInfo = QOSContainersInfo{
Guaranteed: rootContainer, Guaranteed: rootContainer,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment