Merge pull request #73488 from andrewsykim/replace-utils-file

Replace pkg/util/file with k8s.io/utils/path

cmd/kubeadm/.import-restrictions

@@ -41,6 +41,7 @@
 			"AllowedPrefixes": [
 				"k8s.io/utils/exec",
 				"k8s.io/utils/integer",
+				"k8s.io/utils/path",
 				"k8s.io/utils/pointer"
 			]
 		},
@@ -77,7 +78,6 @@
 				"k8s.io/kubernetes/pkg/scheduler/util",
 				"k8s.io/kubernetes/pkg/security/apparmor",
 				"k8s.io/kubernetes/pkg/serviceaccount",
-				"k8s.io/kubernetes/pkg/util/file",
 				"k8s.io/kubernetes/pkg/util/hash",
 				"k8s.io/kubernetes/pkg/util/initsystem",
 				"k8s.io/kubernetes/pkg/util/ipvs",

cmd/kubelet/app/server.go

@@ -369,7 +369,10 @@ func UnsecuredDependencies(s *options.KubeletServer) (*kubelet.Dependencies, err
 		}
 		mounter = mount.NewNsenterMounter(s.RootDirectory, ne)
 		// an exec interface which can use nsenter for flex plugin calls
-		pluginRunner = nsenter.NewNsenterExecutor(nsenter.DefaultHostRootFsPath, exec.New())
+		pluginRunner, err = nsenter.NewNsenter(nsenter.DefaultHostRootFsPath, exec.New())
+		if err != nil {
+			return nil, err
+		}
 	}
 
 	var dockerClientConfig *dockershim.ClientConfig