Update golang dependencies

vendor/k8s.io/kubernetes/pkg/volume/BUILD

@@ -27,21 +27,19 @@ go_library(
         "//pkg/api/v1:go_default_library",
         "//pkg/client/clientset_generated/clientset:go_default_library",
         "//pkg/cloudprovider:go_default_library",
-        "//pkg/util/chmod:go_default_library",
-        "//pkg/util/chown:go_default_library",
         "//pkg/util/io:go_default_library",
         "//pkg/util/mount:go_default_library",
         "//pkg/volume/util:go_default_library",
-        "//vendor:github.com/golang/glog",
-        "//vendor:k8s.io/apimachinery/pkg/api/errors",
-        "//vendor:k8s.io/apimachinery/pkg/api/resource",
-        "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
-        "//vendor:k8s.io/apimachinery/pkg/fields",
-        "//vendor:k8s.io/apimachinery/pkg/types",
-        "//vendor:k8s.io/apimachinery/pkg/util/errors",
-        "//vendor:k8s.io/apimachinery/pkg/util/sets",
-        "//vendor:k8s.io/apimachinery/pkg/util/validation",
-        "//vendor:k8s.io/apimachinery/pkg/watch",
+        "//vendor/github.com/golang/glog:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/api/resource:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/fields:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/types:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/util/errors:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/util/validation:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/watch:go_default_library",
     ],
 )
 
@@ -58,12 +56,12 @@ go_test(
         "//pkg/api:go_default_library",
         "//pkg/api/v1:go_default_library",
         "//pkg/util/slice:go_default_library",
-        "//vendor:k8s.io/apimachinery/pkg/api/errors",
-        "//vendor:k8s.io/apimachinery/pkg/api/resource",
-        "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
-        "//vendor:k8s.io/apimachinery/pkg/types",
-        "//vendor:k8s.io/apimachinery/pkg/util/sets",
-        "//vendor:k8s.io/apimachinery/pkg/watch",
+        "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/api/resource:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/types:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/watch:go_default_library",
     ],
 )
 
@@ -77,7 +75,7 @@ go_test(
     deps = [
         "//pkg/volume:go_default_library",
         "//pkg/volume/testing:go_default_library",
-        "//vendor:k8s.io/client-go/util/testing",
+        "//vendor/k8s.io/client-go/util/testing:go_default_library",
     ],
 )
 

vendor/k8s.io/kubernetes/pkg/volume/OWNERS

@@ -3,6 +3,9 @@ approvers:
 - thockin
 - jsafrane
 - matchstick
+- rootfs
+- gnufied
+- childsb
 reviewers:
 - thockin
 - smarterclayton
@@ -16,6 +19,5 @@ reviewers:
 - jsafrane
 - rootfs
 - jingxu97
-- rkouj
 - msau42
 - gnufied

vendor/k8s.io/kubernetes/pkg/volume/README.md

@@ -1,27 +0,0 @@
-## Multipath
-
-To leverage multiple paths for block storage, it is important to perform the
-multipath configuration on the host.
-If your distribution does not provide `/etc/multipath.conf`, then you can
-either use the following minimalistic one:
-
-    defaults {
-        find_multipaths yes
-        user_friendly_names yes
-    }
-
-or create a new one by running:
-
-    $ mpathconf --enable
-
-Finally you'll need to ensure to start or reload and enable multipath:
-
-    $ systemctl enable multipathd.service
-    $ systemctl restart multipathd.service
-
-**Note:** Any change to `multipath.conf` or enabling multipath can lead to
-inaccessible block devices, because they'll be claimed by multipath and
-exposed as a device in /dev/mapper/*.
-
-Some additional informations about multipath can be found in the
-[iSCSI documentation](iscsi/README.md)

vendor/k8s.io/kubernetes/pkg/volume/plugins.go

@@ -68,9 +68,10 @@ type VolumePlugin interface {
 	// depend on this.
 	Init(host VolumeHost) error
 
-	// Name returns the plugin's name.  Plugins should use namespaced names
-	// such as "example.com/volume".  The "kubernetes.io" namespace is
-	// reserved for plugins which are bundled with kubernetes.
+	// Name returns the plugin's name.  Plugins must use namespaced names
+	// such as "example.com/volume" and contain exactly one '/' character.
+	// The "kubernetes.io" namespace is reserved for plugins which are
+	// bundled with kubernetes.
 	GetPluginName() string
 
 	// GetVolumeName returns the name/ID to uniquely identifying the actual
@@ -156,8 +157,6 @@ const (
 	// Name of a volume in external cloud that is being provisioned and thus
 	// should be ignored by rest of Kubernetes.
 	ProvisionedVolumeName = "placeholder-for-provisioning"
-	// Mount options annotations
-	MountOptionAnnotation = "volume.beta.kubernetes.io/mount-options"
 )
 
 // ProvisionableVolumePlugin is an extended interface of VolumePlugin and is

vendor/k8s.io/kubernetes/pkg/volume/util.go

@@ -386,7 +386,7 @@ func MountOptionFromSpec(spec *Spec, options ...string) []string {
 	pv := spec.PersistentVolume
 
 	if pv != nil {
-		if mo, ok := pv.Annotations[MountOptionAnnotation]; ok {
+		if mo, ok := pv.Annotations[v1.MountOptionAnnotation]; ok {
 			moList := strings.Split(mo, ",")
 			return JoinMountOptions(moList, options)
 		}

vendor/k8s.io/kubernetes/pkg/volume/util/BUILD

@@ -22,13 +22,14 @@ go_library(
     tags = ["automanaged"],
     deps = [
         "//pkg/api/v1:go_default_library",
-        "//pkg/apis/storage/v1beta1:go_default_library",
+        "//pkg/api/v1/helper:go_default_library",
+        "//pkg/apis/storage/v1:go_default_library",
         "//pkg/client/clientset_generated/clientset:go_default_library",
         "//pkg/util/mount:go_default_library",
-        "//vendor:github.com/golang/glog",
-        "//vendor:k8s.io/apimachinery/pkg/api/resource",
-        "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
-        "//vendor:k8s.io/apimachinery/pkg/util/sets",
+        "//vendor/github.com/golang/glog:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/api/resource:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library",
     ],
 )
 
@@ -41,8 +42,8 @@ go_test(
     library = ":go_default_library",
     tags = ["automanaged"],
     deps = [
-        "//vendor:k8s.io/apimachinery/pkg/util/sets",
-        "//vendor:k8s.io/client-go/util/testing",
+        "//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library",
+        "//vendor/k8s.io/client-go/util/testing:go_default_library",
     ],
 )
 

vendor/k8s.io/kubernetes/pkg/volume/util/util.go

@@ -24,7 +24,8 @@ import (
 	"github.com/golang/glog"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/kubernetes/pkg/api/v1"
-	storage "k8s.io/kubernetes/pkg/apis/storage/v1beta1"
+	v1helper "k8s.io/kubernetes/pkg/api/v1/helper"
+	storage "k8s.io/kubernetes/pkg/apis/storage/v1"
 	"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
 	"k8s.io/kubernetes/pkg/util/mount"
 )
@@ -152,13 +153,12 @@ func GetClassForVolume(kubeClient clientset.Interface, pv *v1.PersistentVolume)
 	if kubeClient == nil {
 		return nil, fmt.Errorf("Cannot get kube client")
 	}
-	// TODO: replace with a real attribute after beta
-	className, found := pv.Annotations["volume.beta.kubernetes.io/storage-class"]
-	if !found {
-		return nil, fmt.Errorf("Volume has no class annotation")
+	className := v1helper.GetPersistentVolumeClass(pv)
+	if className == "" {
+		return nil, fmt.Errorf("Volume has no storage class")
 	}
 
-	class, err := kubeClient.StorageV1beta1().StorageClasses().Get(className, metav1.GetOptions{})
+	class, err := kubeClient.StorageV1().StorageClasses().Get(className, metav1.GetOptions{})
 	if err != nil {
 		return nil, err
 	}

vendor/k8s.io/kubernetes/pkg/volume/volume.go

@@ -17,14 +17,8 @@ limitations under the License.
 package volume
 
 import (
-	"io"
-	"io/ioutil"
-	"os"
-	filepath "path/filepath"
-	"runtime"
 	"time"
 
-	"github.com/golang/glog"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
@@ -115,14 +109,14 @@ type Mounter interface {
 	// content should be owned by 'fsGroup' so that it can be
 	// accessed by the pod. This may be called more than once, so
 	// implementations must be idempotent.
-	SetUp(fsGroup *int64) error
+	SetUp(fsGroup *types.UnixGroupID) error
 	// SetUpAt prepares and mounts/unpacks the volume to the
 	// specified directory path, which may or may not exist yet.
 	// The mount point and its content should be owned by
 	// 'fsGroup' so that it can be accessed by the pod. This may
 	// be called more than once, so implementations must be
 	// idempotent.
-	SetUpAt(dir string, fsGroup *int64) error
+	SetUpAt(dir string, fsGroup *types.UnixGroupID) error
 	// GetAttributes returns the attributes of the mounter.
 	GetAttributes() Attributes
 }
@@ -234,96 +228,3 @@ func IsDeletedVolumeInUse(err error) bool {
 func (err deletedVolumeInUseError) Error() string {
 	return string(err)
 }
-
-func RenameDirectory(oldPath, newName string) (string, error) {
-	newPath, err := ioutil.TempDir(filepath.Dir(oldPath), newName)
-	if err != nil {
-		return "", err
-	}
-
-	// os.Rename call fails on windows (https://github.com/golang/go/issues/14527)
-	// Replacing with copyFolder to the newPath and deleting the oldPath directory
-	if runtime.GOOS == "windows" {
-		err = copyFolder(oldPath, newPath)
-		if err != nil {
-			glog.Errorf("Error copying folder from: %s to: %s with error: %v", oldPath, newPath, err)
-			return "", err
-		}
-		os.RemoveAll(oldPath)
-		return newPath, nil
-	}
-
-	err = os.Rename(oldPath, newPath)
-	if err != nil {
-		return "", err
-	}
-	return newPath, nil
-}
-
-func copyFolder(source string, dest string) (err error) {
-	fi, err := os.Lstat(source)
-	if err != nil {
-		glog.Errorf("Error getting stats for %s. %v", source, err)
-		return err
-	}
-
-	err = os.MkdirAll(dest, fi.Mode())
-	if err != nil {
-		glog.Errorf("Unable to create %s directory %v", dest, err)
-	}
-
-	directory, _ := os.Open(source)
-
-	defer directory.Close()
-
-	objects, err := directory.Readdir(-1)
-
-	for _, obj := range objects {
-		if obj.Mode()&os.ModeSymlink != 0 {
-			continue
-		}
-
-		sourceFilePointer := source + "\\" + obj.Name()
-		destinationFilePointer := dest + "\\" + obj.Name()
-
-		if obj.IsDir() {
-			err = copyFolder(sourceFilePointer, destinationFilePointer)
-			if err != nil {
-				return err
-			}
-		} else {
-			err = copyFile(sourceFilePointer, destinationFilePointer)
-			if err != nil {
-				return err
-			}
-		}
-
-	}
-	return
-}
-
-func copyFile(source string, dest string) (err error) {
-	sourceFile, err := os.Open(source)
-	if err != nil {
-		return err
-	}
-
-	defer sourceFile.Close()
-
-	destFile, err := os.Create(dest)
-	if err != nil {
-		return err
-	}
-
-	defer destFile.Close()
-
-	_, err = io.Copy(destFile, sourceFile)
-	if err == nil {
-		sourceInfo, err := os.Stat(source)
-		if err != nil {
-			err = os.Chmod(dest, sourceInfo.Mode())
-		}
-
-	}
-	return
-}

vendor/k8s.io/kubernetes/pkg/volume/volume_linux.go

@@ -22,11 +22,10 @@ import (
 	"path/filepath"
 	"syscall"
 
-	"k8s.io/kubernetes/pkg/util/chmod"
-	"k8s.io/kubernetes/pkg/util/chown"
-
 	"os"
 
+	"k8s.io/apimachinery/pkg/types"
+
 	"github.com/golang/glog"
 )
 
@@ -38,14 +37,12 @@ const (
 // SetVolumeOwnership modifies the given volume to be owned by
 // fsGroup, and sets SetGid so that newly created files are owned by
 // fsGroup. If fsGroup is nil nothing is done.
-func SetVolumeOwnership(mounter Mounter, fsGroup *int64) error {
+func SetVolumeOwnership(mounter Mounter, fsGroup *types.UnixGroupID) error {
 
 	if fsGroup == nil {
 		return nil
 	}
 
-	chownRunner := chown.New()
-	chmodRunner := chmod.New()
 	return filepath.Walk(mounter.GetPath(), func(path string, info os.FileInfo, err error) error {
 		if err != nil {
 			return err
@@ -72,7 +69,7 @@ func SetVolumeOwnership(mounter Mounter, fsGroup *int64) error {
 			return nil
 		}
 
-		err = chownRunner.Chown(path, int(stat.Uid), int(*fsGroup))
+		err = os.Chown(path, int(stat.Uid), int(*fsGroup))
 		if err != nil {
 			glog.Errorf("Chown failed on %v: %v", path, err)
 		}
@@ -86,7 +83,7 @@ func SetVolumeOwnership(mounter Mounter, fsGroup *int64) error {
 			mask |= os.ModeSetgid
 		}
 
-		err = chmodRunner.Chmod(path, info.Mode()|mask)
+		err = os.Chmod(path, info.Mode()|mask)
 		if err != nil {
 			glog.Errorf("Chmod failed on %v: %v", path, err)
 		}

vendor/k8s.io/kubernetes/pkg/volume/volume_unsupported.go

@@ -18,6 +18,8 @@ limitations under the License.
 
 package volume
 
-func SetVolumeOwnership(mounter Mounter, fsGroup *int64) error {
+import "k8s.io/apimachinery/pkg/types"
+
+func SetVolumeOwnership(mounter Mounter, fsGroup *types.UnixGroupID) error {
 	return nil
 }