Update snapshot to k8s v1.11.0

Author: Matthew Wong

snapshot/pkg/cloudprovider/providers/aws/aws.go

@@ -50,6 +50,7 @@ import (
 	"k8s.io/kubernetes/pkg/api/v1/service"
 	"k8s.io/kubernetes/pkg/kubelet/apis"
 	"k8s.io/kubernetes/pkg/volume"
+	"k8s.io/kubernetes/pkg/volume/util"
 )
 
 // ProviderName is the name of this cloud provider.
@@ -1684,7 +1685,7 @@ func (c *Cloud) CreateDisk(volumeOptions *VolumeOptions) (KubernetesVolumeID, er
 
 	createAZ := volumeOptions.AvailabilityZone
 	if createAZ == "" {
-		createAZ = volume.ChooseZoneForVolume(allZones, volumeOptions.PVCName)
+		createAZ = util.ChooseZoneForVolume(allZones, volumeOptions.PVCName)
 	}
 
 	var createType string

snapshot/pkg/volume/awsebs/processor.go

@@ -23,7 +23,7 @@ import (
 
 	"k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	kvol "k8s.io/kubernetes/pkg/volume"
+	kvol "k8s.io/kubernetes/pkg/volume/util"
 
 	"github.com/golang/glog"
 

snapshot/pkg/volume/cinder/processor.go

@@ -30,7 +30,7 @@ import (
 	"github.com/kubernetes-incubator/external-storage/snapshot/pkg/cloudprovider"
 	"github.com/kubernetes-incubator/external-storage/snapshot/pkg/cloudprovider/providers/openstack"
 	"github.com/kubernetes-incubator/external-storage/snapshot/pkg/volume"
-	k8sVol "k8s.io/kubernetes/pkg/volume"
+	k8sVol "k8s.io/kubernetes/pkg/volume/util"
 )
 
 type cinderPlugin struct {
@@ -145,7 +145,7 @@ func (c *cinderPlugin) SnapshotRestore(snapshotData *crdv1.VolumeSnapshotData, p
 	}
 	glog.V(2).Infof("Successfully created Cinder Volume from Snapshot, Volume: %s", volumeID)
 	pv := &v1.PersistentVolumeSource{
-		Cinder: &v1.CinderVolumeSource{
+		Cinder: &v1.CinderPersistentVolumeSource{
 			VolumeID: volumeID,
 			FSType:   "ext4",
 			ReadOnly: false,

snapshot/pkg/volume/gcepd/processor.go

@@ -29,7 +29,7 @@ import (
 	"k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/kubernetes/pkg/kubelet/apis"
-	k8svol "k8s.io/kubernetes/pkg/volume"
+	k8svol "k8s.io/kubernetes/pkg/volume/util"
 )
 
 const (