dependencies: pkg/volume

pkg/volume/cephfs/cephfs.go

@@ -22,7 +22,7 @@ import (
 	"strings"
 
 	"github.com/golang/glog"
-	"k8s.io/kubernetes/pkg/api"
+	"k8s.io/kubernetes/pkg/api/v1"
 	"k8s.io/kubernetes/pkg/types"
 	"k8s.io/kubernetes/pkg/util/mount"
 	utilstrings "k8s.io/kubernetes/pkg/util/strings"
@@ -70,15 +70,15 @@ func (plugin *cephfsPlugin) RequiresRemount() bool {
 	return false
 }
 
-func (plugin *cephfsPlugin) GetAccessModes() []api.PersistentVolumeAccessMode {
-	return []api.PersistentVolumeAccessMode{
-		api.ReadWriteOnce,
-		api.ReadOnlyMany,
-		api.ReadWriteMany,
+func (plugin *cephfsPlugin) GetAccessModes() []v1.PersistentVolumeAccessMode {
+	return []v1.PersistentVolumeAccessMode{
+		v1.ReadWriteOnce,
+		v1.ReadOnlyMany,
+		v1.ReadWriteMany,
 	}
 }
 
-func (plugin *cephfsPlugin) NewMounter(spec *volume.Spec, pod *api.Pod, _ volume.VolumeOptions) (volume.Mounter, error) {
+func (plugin *cephfsPlugin) NewMounter(spec *volume.Spec, pod *v1.Pod, _ volume.VolumeOptions) (volume.Mounter, error) {
 	cephvs, _, err := getVolumeSource(spec)
 	if err != nil {
 		return nil, err
@@ -155,10 +155,10 @@ func (plugin *cephfsPlugin) newUnmounterInternal(volName string, podUID types.UI
 }
 
 func (plugin *cephfsPlugin) ConstructVolumeSpec(volumeName, mountPath string) (*volume.Spec, error) {
-	cephfsVolume := &api.Volume{
+	cephfsVolume := &v1.Volume{
 		Name: volumeName,
-		VolumeSource: api.VolumeSource{
-			CephFS: &api.CephFSVolumeSource{
+		VolumeSource: v1.VolumeSource{
+			CephFS: &v1.CephFSVolumeSource{
 				Monitors: []string{},
 				Path:     volumeName,
 			},
@@ -312,7 +312,7 @@ func (cephfsVolume *cephfs) execMount(mountpoint string) error {
 	return nil
 }
 
-func getVolumeSource(spec *volume.Spec) (*api.CephFSVolumeSource, bool, error) {
+func getVolumeSource(spec *volume.Spec) (*v1.CephFSVolumeSource, bool, error) {
 	if spec.Volume != nil && spec.Volume.CephFS != nil {
 		return spec.Volume.CephFS, spec.Volume.CephFS.ReadOnly, nil
 	} else if spec.PersistentVolume != nil &&