Fix duplicate proto error in kubectl 1.8.0-alpha.

- Remove vendor'ed package go.pedge.io/pb/go/google/protobuf.
- Update vendor'ed package github.com/libopenstorage/openstorage.

vendor/github.com/libopenstorage/openstorage/volume/volume.go

@@ -7,30 +7,67 @@ import (
 )
 
 var (
-	ErrAlreadyShutdown         = errors.New("VolumeDriverProvider already shutdown")
-	ErrExist                   = errors.New("Driver already exists")
-	ErrDriverNotFound          = errors.New("Driver implementation not found")
-	ErrDriverInitializing      = errors.New("Driver is initializing")
-	ErrEnoEnt                  = errors.New("Volume does not exist.")
-	ErrEnomem                  = errors.New("Out of memory.")
-	ErrEinval                  = errors.New("Invalid argument")
-	ErrVolDetached             = errors.New("Volume is detached")
-	ErrVolAttached             = errors.New("Volume is attached")
+	// ErrAlreadyShutdown returned when driver is shutdown
+	ErrAlreadyShutdown = errors.New("VolumeDriverProvider already shutdown")
+	// ErrExit returned when driver already registered
+	ErrExist = errors.New("Already exists")
+	// ErrDriverNotFound returned when a driver is not registered
+	ErrDriverNotFound = errors.New("Driver implementation not found")
+	// ErrDriverInitializing returned when a driver is initializing
+	ErrDriverInitializing = errors.New("Driver is initializing")
+	// ErrEnoEnt returned when volume does not exist
+	ErrEnoEnt = errors.New("Volume does not exist.")
+	// ErrEnomem returned when we are out of memory
+	ErrEnomem = errors.New("Out of memory.")
+	// ErrEinval returned when an invalid input is provided
+	ErrEinval = errors.New("Invalid argument")
+	// ErrVolDetached returned when volume is in detached state
+	ErrVolDetached = errors.New("Volume is detached")
+	// ErrVolAttached returned when volume is in attached state
+	ErrVolAttached = errors.New("Volume is attached")
+	// ErrVolAttachedOnRemoteNode returned when volume is in attached on different node
 	ErrVolAttachedOnRemoteNode = errors.New("Volume is attached on another node")
-	ErrVolAttachedScale        = errors.New("Volume is attached but can be scaled")
-	ErrVolHasSnaps             = errors.New("Volume has snapshots associated")
-	ErrNotSupported            = errors.New("Operation not supported")
+	// ErrVolAttachedScale returned when volume is attached and can be scaled
+	ErrVolAttachedScale = errors.New("Volume is attached on another node." +
+		" Increase scale factor to create more instances")
+	// ErrVolHasSnaps returned when volume has previous snapshots
+	ErrVolHasSnaps = errors.New("Volume has snapshots associated")
+	// ErrNotSupported returned when the operation is not supported
+	ErrNotSupported = errors.New("Operation not supported")
+	// ErrVolBusy returned when volume is in busy state
+	ErrVolBusy = errors.New("Volume is busy")
 )
 
 // Constants used by the VolumeDriver
 const (
-	APIVersion    = "v1"
+	// APIVersion for the volume management apis
+	APIVersion = "v1"
+	// PluginAPIBase where the docker unix socket resides
 	PluginAPIBase = "/run/docker/plugins/"
+	// DriverAPIBase where the osd unix socket resides
 	DriverAPIBase = "/var/lib/osd/driver/"
-	MountBase     = "/var/lib/osd/mounts/"
-	VolumeBase    = "/var/lib/osd/"
+	// MountBase for osd mountpoints
+	MountBase = "/var/lib/osd/mounts/"
+	// VolumeBase for osd volumes
+	VolumeBase = "/var/lib/osd/"
 )
 
+const (
+	// LocationConstaint is a label that specifies data location constraint.
+	LocationConstraint = "LocationConstraint"
+	// LocalNode is an alias for this node - similar to localhost.
+	LocalNode = "LocalNode"
+)
+
+// AttachOptionsKey specifies a key type from a key-value pair
+// that will be passed in to the Attach api
+type AttachOptionsKey string
+
+const (
+	AttachOptionsSecret = AttachOptionsKey("SECRET_KEY")
+)
+
+// Store defines the interface for basic volume store operations
 type Store interface {
 	// Lock volume specified by volumeID.
 	Lock(volumeID string) (interface{}, error)
@@ -68,16 +105,34 @@ type IODriver interface {
 	Flush(volumeID string) error
 }
 
+// SnapshotDriver interfaces provides snapshot capability
 type SnapshotDriver interface {
 	// Snapshot create volume snapshot.
 	// Errors ErrEnoEnt may be returned
 	Snapshot(volumeID string, readonly bool, locator *api.VolumeLocator) (string, error)
+	// Restore restores volume to specified snapshot.
+	Restore(volumeID string, snapshotID string) error
+}
+
+// StatsDriver interface provides stats features
+type StatsDriver interface {
+	// Stats for specified volume.
+	// cumulative stats are /proc/diskstats style stats.
+	// nonCumulative stats are stats for specific duration.
+	// Errors ErrEnoEnt may be returned
+	Stats(volumeID string, cumulative bool) (*api.Stats, error)
+	// UsedSize returns currently used volume size.
+	// Errors ErrEnoEnt may be returned.
+	UsedSize(volumeID string) (uint64, error)
+	// GetActiveRequests get active requests
+	GetActiveRequests() (*api.ActiveRequests, error)
 }
 
 // ProtoDriver must be implemented by all volume drivers.  It specifies the
 // most basic functionality, such as creating and deleting volumes.
 type ProtoDriver interface {
 	SnapshotDriver
+	StatsDriver
 	// Name returns the name of the driver.
 	Name() string
 	// Type of this driver
@@ -99,16 +154,6 @@ type ProtoDriver interface {
 	// Update not all fields of the spec are supported, ErrNotSupported will be thrown for unsupported
 	// updates.
 	Set(volumeID string, locator *api.VolumeLocator, spec *api.VolumeSpec) error
-	// Stats for specified volume.
-	// cumulative stats are /proc/diskstats style stats.
-	// nonCumulative stats are stats for specific duration.
-	// Errors ErrEnoEnt may be returned
-	Stats(volumeID string, cumulative bool) (*api.Stats, error)
-	// Alerts on this volume.
-	// Errors ErrEnoEnt may be returned
-	Alerts(volumeID string) (*api.Alerts, error)
-	// GetActiveRequests get active requests
-	GetActiveRequests() (*api.ActiveRequests, error)
 	// Status returns a set of key-value pairs which give low
 	// level diagnostic status about this driver.
 	Status() [][2]string
@@ -128,6 +173,7 @@ type Enumerator interface {
 	SnapEnumerate(volID []string, snapLabels map[string]string) ([]*api.Volume, error)
 }
 
+// StoreEnumerator combines Store and Enumerator capabilities
 type StoreEnumerator interface {
 	Store
 	Enumerator
@@ -139,10 +185,10 @@ type BlockDriver interface {
 	// Attach map device to the host.
 	// On success the devicePath specifies location where the device is exported
 	// Errors ErrEnoEnt, ErrVolAttached may be returned.
-	Attach(volumeID string) (string, error)
+	Attach(volumeID string, attachOptions map[string]string) (string, error)
 	// Detach device from the host.
 	// Errors ErrEnoEnt, ErrVolDetached may be returned.
-	Detach(volumeID string) error
+	Detach(volumeID string, unmountBeforeDetach bool) error
 }
 
 // VolumeDriverProvider provides VolumeDrivers.
@@ -165,7 +211,7 @@ type VolumeDriverRegistry interface {
 	Add(name string, init func(map[string]string) (VolumeDriver, error)) error
 }
 
-// VolumeDriverRegistry constructs a new VolumeDriverRegistry.
+// NewVolumeDriverRegistry constructs a new VolumeDriverRegistry.
 func NewVolumeDriverRegistry(nameToInitFunc map[string]func(map[string]string) (VolumeDriver, error)) VolumeDriverRegistry {
 	return newVolumeDriverRegistry(nameToInitFunc)
 }

vendor/github.com/libopenstorage/openstorage/volume/volume_not_supported.go

@@ -8,19 +8,24 @@ var (
 	// BlockNotSupported is a default (null) block driver implementation.  This can be
 	// used by drivers that do not want to (or care about) implementing the attach,
 	// format and detach interfaces.
-	BlockNotSupported    = &blockNotSupported{}
+	BlockNotSupported = &blockNotSupported{}
+	// SnapshotNotSupported is a null snapshot driver implementation. This can be used
+	// by drivers that do not want to implement the snapshot interface
 	SnapshotNotSupported = &snapshotNotSupported{}
-	IONotSupported       = &ioNotSupported{}
+	// IONotSupported is a null IODriver interface
+	IONotSupported = &ioNotSupported{}
+	// StatsNotSupported is a null stats driver implementation. This can be used
+	// by drivers that do not want to implement the stats interface.
+	StatsNotSupported = &statsNotSupported{}
 )
 
-
 type blockNotSupported struct{}
 
-func (b *blockNotSupported) Attach(volumeID string) (string, error) {
+func (b *blockNotSupported) Attach(volumeID string, attachOptions map[string]string) (string, error) {
 	return "", ErrNotSupported
 }
 
-func (b *blockNotSupported) Detach(volumeID string) error {
+func (b *blockNotSupported) Detach(volumeID string, unmountBeforeDetach bool) error {
 	return ErrNotSupported
 }
 
@@ -30,6 +35,10 @@ func (s *snapshotNotSupported) Snapshot(volumeID string, readonly bool, locator
 	return "", ErrNotSupported
 }
 
+func (s *snapshotNotSupported) Restore(volumeID, snapshotID string) error {
+	return ErrNotSupported
+}
+
 type ioNotSupported struct{}
 
 func (i *ioNotSupported) Read(volumeID string, buffer []byte, size uint64, offset int64) (int64, error) {
@@ -43,3 +52,23 @@ func (i *ioNotSupported) Write(volumeID string, buffer []byte, size uint64, offs
 func (i *ioNotSupported) Flush(volumeID string) error {
 	return ErrNotSupported
 }
+
+type statsNotSupported struct{}
+
+// Stats returns stats
+func (s *statsNotSupported) Stats(
+	volumeID string,
+	cumulative bool,
+) (*api.Stats, error) {
+	return nil, ErrNotSupported
+}
+
+// UsedSize returns allocated size
+func (s *statsNotSupported) UsedSize(volumeID string) (uint64, error) {
+	return 0, ErrNotSupported
+}
+
+// GetActiveRequests gets active requests
+func (s *statsNotSupported) GetActiveRequests() (*api.ActiveRequests, error) {
+	return nil, nil
+}