Revert "Merge pull request 101888 from kolyshkin/update-runc-rc94"

This reverts commit b1b06fe0a4, reversing
changes made to 382a33986b.

pkg/kubelet/cm/cgroup_manager_linux.go

@@ -334,7 +334,7 @@ type subsystem interface {
 	// Name returns the name of the subsystem.
 	Name() string
 	// Set the cgroup represented by cgroup.
-	Set(path string, cgroup *libcontainerconfigs.Resources) error
+	Set(path string, cgroup *libcontainerconfigs.Cgroup) error
 	// GetStats returns the statistics associated with the cgroup
 	GetStats(path string, stats *libcontainercgroups.Stats) error
 }
@@ -370,7 +370,7 @@ func setSupportedSubsystemsV1(cgroupConfig *libcontainerconfigs.Cgroup) error {
 			klog.V(6).InfoS("Unable to find subsystem mount for optional subsystem", "subsystemName", sys.Name())
 			continue
 		}
-		if err := sys.Set(cgroupConfig.Paths[sys.Name()], cgroupConfig.Resources); err != nil {
+		if err := sys.Set(cgroupConfig.Paths[sys.Name()], cgroupConfig); err != nil {
 			return fmt.Errorf("failed to set config for supported subsystems : %v", err)
 		}
 	}
@@ -492,7 +492,10 @@ func setResourcesV2(cgroupConfig *libcontainerconfigs.Cgroup) error {
 	if err != nil {
 		return fmt.Errorf("failed to create cgroup v2 manager: %v", err)
 	}
-	return manager.Set(cgroupConfig.Resources)
+	config := &libcontainerconfigs.Config{
+		Cgroups: cgroupConfig,
+	}
+	return manager.Set(config)
 }
 
 func (m *cgroupManagerImpl) toResources(resourceConfig *ResourceConfig) *libcontainerconfigs.Resources {

pkg/kubelet/cm/container_manager_linux.go

@@ -533,8 +533,12 @@ func (cm *containerManagerImpl) setupNode(activePods ActivePodsFunc) error {
 			return err
 		}
 
+		manager, err := createManager(cm.KubeletCgroupsName)
+		if err != nil {
+			return err
+		}
 		cont.ensureStateFunc = func(_ cgroups.Manager) error {
-			return ensureProcessInContainerWithOOMScore(os.Getpid(), qos.KubeletOOMScoreAdj, cont.manager)
+			return ensureProcessInContainerWithOOMScore(os.Getpid(), qos.KubeletOOMScoreAdj, manager)
 		}
 		systemContainers = append(systemContainers, cont)
 	} else {

pkg/kubelet/nodeshutdown/systemd/inhibit_linux_test.go

@@ -71,10 +71,6 @@ func (obj *fakeDBusObject) SetProperty(p string, v interface{}) error {
 	return nil
 }
 
-func (obj *fakeDBusObject) StoreProperty(p string, v interface{}) error {
-	return nil
-}
-
 func (obj *fakeDBusObject) Destination() string {
 	return ""
 }