update vendor k8s.io/utils to ed37f7428a91fc2a81070808937195dcd46d320e

vendor/k8s.io/utils/nsenter/BUILD

@@ -3,8 +3,6 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library")
 go_library(
     name = "go_default_library",
     srcs = [
-        "exec.go",
-        "exec_unsupported.go",
         "nsenter.go",
         "nsenter_unsupported.go",
     ],

vendor/k8s.io/utils/nsenter/exec.go

@@ -1,67 +0,0 @@
-// +build linux
-
-/*
-Copyright 2018 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package nsenter
-
-import (
-	"context"
-	"fmt"
-	"path/filepath"
-
-	"k8s.io/klog"
-	"k8s.io/utils/exec"
-)
-
-// Executor wraps executor interface to be executed via nsenter
-type Executor struct {
-	// Exec implementation
-	executor exec.Interface
-	// Path to the host's root proc path
-	hostProcMountNsPath string
-}
-
-// NewNsenterExecutor returns new nsenter based executor
-func NewNsenterExecutor(hostRootFsPath string, executor exec.Interface) *Executor {
-	hostProcMountNsPath := filepath.Join(hostRootFsPath, mountNsPath)
-	nsExecutor := &Executor{
-		hostProcMountNsPath: hostProcMountNsPath,
-		executor:            executor,
-	}
-	return nsExecutor
-}
-
-// Command returns a command wrapped with nenter
-func (nsExecutor *Executor) Command(cmd string, args ...string) exec.Cmd {
-	fullArgs := append([]string{fmt.Sprintf("--mount=%s", nsExecutor.hostProcMountNsPath), "--"},
-		append([]string{cmd}, args...)...)
-	klog.V(5).Infof("Running nsenter command: %v %v", nsenterPath, fullArgs)
-	return nsExecutor.executor.Command(nsenterPath, fullArgs...)
-}
-
-// CommandContext returns a CommandContext wrapped with nsenter
-func (nsExecutor *Executor) CommandContext(ctx context.Context, cmd string, args ...string) exec.Cmd {
-	fullArgs := append([]string{fmt.Sprintf("--mount=%s", nsExecutor.hostProcMountNsPath), "--"},
-		append([]string{cmd}, args...)...)
-	klog.V(5).Infof("Running nsenter command: %v %v", nsenterPath, fullArgs)
-	return nsExecutor.executor.CommandContext(ctx, nsenterPath, fullArgs...)
-}
-
-// LookPath returns a LookPath wrapped with nsenter
-func (nsExecutor *Executor) LookPath(file string) (string, error) {
-	return "", fmt.Errorf("not implemented, error looking up : %s", file)
-}

vendor/k8s.io/utils/nsenter/exec_unsupported.go

@@ -1,58 +0,0 @@
-// +build !linux
-
-/*
-Copyright 2017 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package nsenter
-
-import (
-	"context"
-	"fmt"
-
-	"k8s.io/utils/exec"
-)
-
-// Executor wraps executor interface to be executed via nsenter
-type Executor struct {
-	// Exec implementation
-	executor exec.Interface
-	// Path to the host's root proc path
-	hostProcMountNsPath string
-}
-
-// NewNsenterExecutor returns new nsenter based executor
-func NewNsenterExecutor(hostRootFsPath string, executor exec.Interface) *Executor {
-	nsExecutor := &Executor{
-		hostProcMountNsPath: hostRootFsPath,
-		executor:            executor,
-	}
-	return nsExecutor
-}
-
-// Command returns a command wrapped with nenter
-func (nsExecutor *Executor) Command(cmd string, args ...string) exec.Cmd {
-	return nil
-}
-
-// CommandContext returns a CommandContext wrapped with nsenter
-func (nsExecutor *Executor) CommandContext(ctx context.Context, cmd string, args ...string) exec.Cmd {
-	return nil
-}
-
-// LookPath returns a LookPath wrapped with nsenter
-func (nsExecutor *Executor) LookPath(file string) (string, error) {
-	return "", fmt.Errorf("not implemented, error looking up : %s", file)
-}

vendor/k8s.io/utils/nsenter/nsenter.go

@@ -40,10 +40,13 @@ const (
 	nsenterPath = "nsenter"
 )
 
-// Nsenter is part of experimental support for running the kubelet
+// Nsenter is a type alias for backward compatibility
+type Nsenter = NSEnter
+
+// NSEnter is part of experimental support for running the kubelet
 // in a container.
 //
-// Nsenter requires:
+// NSEnter requires:
 //
 // 1.  Docker >= 1.6 due to the dependency on the slave propagation mode
 //     of the bind-mount of the kubelet root directory in the container.
@@ -65,20 +68,20 @@ const (
 //     systemd is installed/enabled in the operating system.
 // For more information about mount propagation modes, see:
 //   https://www.kernel.org/doc/Documentation/filesystems/sharedsubtree.txt
-type Nsenter struct {
+type NSEnter struct {
 	// a map of commands to their paths on the host filesystem
 	paths map[string]string
 
 	// Path to the host filesystem, typically "/rootfs". Used only for testing.
 	hostRootFsPath string
 
-	// Exec implementation, used only for testing
+	// Exec implementation
 	executor exec.Interface
 }
 
-// NewNsenter constructs a new instance of Nsenter
-func NewNsenter(hostRootFsPath string, executor exec.Interface) (*Nsenter, error) {
-	ne := &Nsenter{
+// NewNsenter constructs a new instance of NSEnter
+func NewNsenter(hostRootFsPath string, executor exec.Interface) (*NSEnter, error) {
+	ne := &NSEnter{
 		hostRootFsPath: hostRootFsPath,
 		executor:       executor,
 	}
@@ -88,7 +91,7 @@ func NewNsenter(hostRootFsPath string, executor exec.Interface) (*Nsenter, error
 	return ne, nil
 }
 
-func (ne *Nsenter) initPaths() error {
+func (ne *NSEnter) initPaths() error {
 	ne.paths = map[string]string{}
 	binaries := []string{
 		"mount",
@@ -122,7 +125,7 @@ func (ne *Nsenter) initPaths() error {
 }
 
 // Exec executes nsenter commands in hostProcMountNsPath mount namespace
-func (ne *Nsenter) Exec(cmd string, args []string) exec.Cmd {
+func (ne *NSEnter) Exec(cmd string, args []string) exec.Cmd {
 	hostProcMountNsPath := filepath.Join(ne.hostRootFsPath, mountNsPath)
 	fullArgs := append([]string{fmt.Sprintf("--mount=%s", hostProcMountNsPath), "--"},
 		append([]string{ne.AbsHostPath(cmd)}, args...)...)
@@ -130,8 +133,27 @@ func (ne *Nsenter) Exec(cmd string, args []string) exec.Cmd {
 	return ne.executor.Command(nsenterPath, fullArgs...)
 }
 
+// Command returns a command wrapped with nsenter
+func (ne *NSEnter) Command(cmd string, args ...string) exec.Cmd {
+	return ne.Exec(cmd, args)
+}
+
+// CommandContext returns a CommandContext wrapped with nsenter
+func (ne *NSEnter) CommandContext(ctx context.Context, cmd string, args ...string) exec.Cmd {
+	hostProcMountNsPath := filepath.Join(ne.hostRootFsPath, mountNsPath)
+	fullArgs := append([]string{fmt.Sprintf("--mount=%s", hostProcMountNsPath), "--"},
+		append([]string{ne.AbsHostPath(cmd)}, args...)...)
+	klog.V(5).Infof("Running nsenter command: %v %v", nsenterPath, fullArgs)
+	return ne.executor.CommandContext(ctx, nsenterPath, fullArgs...)
+}
+
+// LookPath returns a LookPath wrapped with nsenter
+func (ne *NSEnter) LookPath(file string) (string, error) {
+	return "", fmt.Errorf("not implemented, error looking up : %s", file)
+}
+
 // AbsHostPath returns the absolute runnable path for a specified command
-func (ne *Nsenter) AbsHostPath(command string) string {
+func (ne *NSEnter) AbsHostPath(command string) string {
 	path, ok := ne.paths[command]
 	if !ok {
 		return command
@@ -140,7 +162,7 @@ func (ne *Nsenter) AbsHostPath(command string) string {
 }
 
 // SupportsSystemd checks whether command systemd-run exists
-func (ne *Nsenter) SupportsSystemd() (string, bool) {
+func (ne *NSEnter) SupportsSystemd() (string, bool) {
 	systemdRunPath, ok := ne.paths["systemd-run"]
 	return systemdRunPath, ok && systemdRunPath != ""
 }
@@ -158,7 +180,7 @@ func (ne *Nsenter) SupportsSystemd() (string, bool) {
 //
 // BEWARE! EvalSymlinks is not able to detect symlink looks with mustExist=false!
 // If /tmp/link is symlink to /tmp/link, EvalSymlinks(/tmp/link/foo) returns /tmp/link/foo.
-func (ne *Nsenter) EvalSymlinks(pathname string, mustExist bool) (string, error) {
+func (ne *NSEnter) EvalSymlinks(pathname string, mustExist bool) (string, error) {
 	var args []string
 	if mustExist {
 		// "realpath -e: all components of the path must exist"
@@ -178,16 +200,16 @@ func (ne *Nsenter) EvalSymlinks(pathname string, mustExist bool) (string, error)
 // KubeletPath returns the path name that can be accessed by containerized
 // kubelet. It is recommended to resolve symlinks on the host by EvalSymlinks
 // before calling this function
-func (ne *Nsenter) KubeletPath(pathname string) string {
+func (ne *NSEnter) KubeletPath(pathname string) string {
 	return filepath.Join(ne.hostRootFsPath, pathname)
 }
 
-// NewFakeNsenter returns a Nsenter that does not run "nsenter --mount=... --",
+// NewFakeNsenter returns a NSEnter that does not run "nsenter --mount=... --",
 // but runs everything in the same mount namespace as the unit test binary.
 // rootfsPath is supposed to be a symlink, e.g. /tmp/xyz/rootfs -> /.
-// This fake Nsenter is enough for most operations, e.g. to resolve symlinks,
+// This fake NSEnter is enough for most operations, e.g. to resolve symlinks,
 // but it's not enough to call /bin/mount - unit tests don't run as root.
-func NewFakeNsenter(rootfsPath string) (*Nsenter, error) {
+func NewFakeNsenter(rootfsPath string) (*NSEnter, error) {
 	executor := &fakeExec{
 		rootfsPath: rootfsPath,
 	}
@@ -218,7 +240,7 @@ type fakeExec struct {
 }
 
 func (f fakeExec) Command(cmd string, args ...string) exec.Cmd {
-	// This will intentionaly panic if Nsenter does not provide enough arguments.
+	// This will intentionaly panic if NSEnter does not provide enough arguments.
 	realCmd := args[2]
 	realArgs := args[3:]
 	return exec.New().Command(realCmd, realArgs...)
@@ -233,3 +255,4 @@ func (fakeExec) CommandContext(ctx context.Context, cmd string, args ...string)
 }
 
 var _ exec.Interface = fakeExec{}
+var _ exec.Interface = &NSEnter{}

vendor/k8s.io/utils/nsenter/nsenter_unsupported.go

@@ -19,6 +19,9 @@ limitations under the License.
 package nsenter
 
 import (
+	"context"
+	"fmt"
+
 	"k8s.io/utils/exec"
 )
 
@@ -28,29 +31,49 @@ const (
 	DefaultHostRootFsPath = "/rootfs"
 )
 
-// Nsenter is part of experimental support for running the kubelet
+// Nsenter is a type alias for backward compatibility
+type Nsenter = NSEnter
+
+// NSEnter is part of experimental support for running the kubelet
 // in a container.
-type Nsenter struct {
+type NSEnter struct {
 	// a map of commands to their paths on the host filesystem
 	Paths map[string]string
 }
 
-// NewNsenter constructs a new instance of Nsenter
+// NewNsenter constructs a new instance of NSEnter
 func NewNsenter(hostRootFsPath string, executor exec.Interface) (*Nsenter, error) {
 	return &Nsenter{}, nil
 }
 
 // Exec executes nsenter commands in hostProcMountNsPath mount namespace
-func (ne *Nsenter) Exec(cmd string, args []string) exec.Cmd {
+func (ne *NSEnter) Exec(cmd string, args []string) exec.Cmd {
 	return nil
 }
 
 // AbsHostPath returns the absolute runnable path for a specified command
-func (ne *Nsenter) AbsHostPath(command string) string {
+func (ne *NSEnter) AbsHostPath(command string) string {
 	return ""
 }
 
 // SupportsSystemd checks whether command systemd-run exists
-func (ne *Nsenter) SupportsSystemd() (string, bool) {
+func (ne *NSEnter) SupportsSystemd() (string, bool) {
 	return "", false
 }
+
+// Command returns a command wrapped with nenter
+func (ne *NSEnter) Command(cmd string, args ...string) exec.Cmd {
+	return nil
+}
+
+// CommandContext returns a CommandContext wrapped with nsenter
+func (ne *NSEnter) CommandContext(ctx context.Context, cmd string, args ...string) exec.Cmd {
+	return nil
+}
+
+// LookPath returns a LookPath wrapped with nsenter
+func (ne *NSEnter) LookPath(file string) (string, error) {
+	return "", fmt.Errorf("not implemented, error looking up : %s", file)
+}
+
+var _ exec.Interface = &NSEnter{}

vendor/k8s.io/utils/path/BUILD

@@ -0,0 +1,23 @@
+load("@io_bazel_rules_go//go:def.bzl", "go_library")
+
+go_library(
+    name = "go_default_library",
+    srcs = ["file.go"],
+    importmap = "k8s.io/kubernetes/vendor/k8s.io/utils/path",
+    importpath = "k8s.io/utils/path",
+    visibility = ["//visibility:public"],
+)
+
+filegroup(
+    name = "package-srcs",
+    srcs = glob(["**"]),
+    tags = ["automanaged"],
+    visibility = ["//visibility:private"],
+)
+
+filegroup(
+    name = "all-srcs",
+    srcs = [":package-srcs"],
+    tags = ["automanaged"],
+    visibility = ["//visibility:public"],
+)

vendor/k8s.io/utils/path/file.go

@@ -0,0 +1,78 @@
+/*
+Copyright 2017 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package path
+
+import (
+	"errors"
+	"os"
+)
+
+// LinkTreatment is the base type for constants used by Exists that indicate
+// how symlinks are treated for existence checks.
+type LinkTreatment int
+
+const (
+	// CheckFollowSymlink follows the symlink and verifies that the target of
+	// the symlink exists.
+	CheckFollowSymlink LinkTreatment = iota
+
+	// CheckSymlinkOnly does not follow the symlink and verfies only that they
+	// symlink itself exists.
+	CheckSymlinkOnly
+)
+
+// ErrInvalidLinkTreatment indicates that the link treatment behavior requested
+// is not a valid behavior.
+var ErrInvalidLinkTreatment = errors.New("unknown link behavior")
+
+// Exists checks if specified file, directory, or symlink exists. The behavior
+// of the test depends on the linkBehaviour argument. See LinkTreatment for
+// more details.
+func Exists(linkBehavior LinkTreatment, filename string) (bool, error) {
+	var err error
+
+	if linkBehavior == CheckFollowSymlink {
+		_, err = os.Stat(filename)
+	} else if linkBehavior == CheckSymlinkOnly {
+		_, err = os.Lstat(filename)
+	} else {
+		return false, ErrInvalidLinkTreatment
+	}
+
+	if os.IsNotExist(err) {
+		return false, nil
+	} else if err != nil {
+		return false, err
+	}
+	return true, nil
+}
+
+// ReadDirNoStat returns a string of files/directories contained
+// in dirname without calling lstat on them.
+func ReadDirNoStat(dirname string) ([]string, error) {
+	if dirname == "" {
+		dirname = "."
+	}
+
+	f, err := os.Open(dirname)
+	if err != nil {
+		return nil, err
+	}
+	defer f.Close()
+
+	return f.Readdirnames(-1)
+}