More usernetes patches

3b9ad7c2 · Darren Shepherd · Erik Wilson · f3312585 · 3b9ad7c2
Commit 3b9ad7c2 authored Apr 09, 2019 by Darren Shepherd Committed by Erik Wilson Aug 05, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

qos_container_manager_linux.go pkg/kubelet/cm/qos_container_manager_linux.go +5 -1

No files found.
--- a/pkg/kubelet/cm/qos_container_manager_linux.go
+++ b/pkg/kubelet/cm/qos_container_manager_linux.go
@@ -119,7 +119,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)
+				}
 			}
 		}
 	}