From 858a85e8fec177d2a0b69a25315503a5ee474d6f Mon Sep 17 00:00:00 2001 From: Brendan Burns Date: Fri, 6 Feb 2015 09:58:03 -0800 Subject: [PATCH] Revert "Start using GCE safe format and mount for mounting disks." This reverts commit 3f109d6d4601795b685b5a2d180c85983b900d8b. --- pkg/kubelet/volume/gce_pd/gce_pd.go | 3 +-- pkg/kubelet/volume/gce_pd/gce_util.go | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkg/kubelet/volume/gce_pd/gce_pd.go b/pkg/kubelet/volume/gce_pd/gce_pd.go index c7de64caffd..294662b185b 100644 --- a/pkg/kubelet/volume/gce_pd/gce_pd.go +++ b/pkg/kubelet/volume/gce_pd/gce_pd.go @@ -25,7 +25,6 @@ import ( "github.com/GoogleCloudPlatform/kubernetes/pkg/api" "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/volume" "github.com/GoogleCloudPlatform/kubernetes/pkg/types" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/exec" "github.com/GoogleCloudPlatform/kubernetes/pkg/util/mount" "github.com/golang/glog" ) @@ -72,7 +71,7 @@ func (plugin *gcePersistentDiskPlugin) CanSupport(spec *api.Volume) bool { func (plugin *gcePersistentDiskPlugin) NewBuilder(spec *api.Volume, podUID types.UID) (volume.Builder, error) { // Inject real implementations here, test through the internal function. - return plugin.newBuilderInternal(spec, podUID, &GCEDiskUtil{}, &gceSafeFormatAndMount{mount.New(), exec.New()}) + return plugin.newBuilderInternal(spec, podUID, &GCEDiskUtil{}, mount.New()) } func (plugin *gcePersistentDiskPlugin) newBuilderInternal(spec *api.Volume, podUID types.UID, manager pdManager, mounter mount.Interface) (volume.Builder, error) { diff --git a/pkg/kubelet/volume/gce_pd/gce_util.go b/pkg/kubelet/volume/gce_pd/gce_util.go index b9c4c56a7d1..45a6996fdca 100644 --- a/pkg/kubelet/volume/gce_pd/gce_util.go +++ b/pkg/kubelet/volume/gce_pd/gce_util.go @@ -147,7 +147,7 @@ func (util *GCEDiskUtil) DetachDisk(pd *gcePersistentDisk, devicePath string) er // This eliminates the necesisty to format a PD before it is used with a Pod on GCE. // TODO: port this script into Go and use it for all Linux platforms type gceSafeFormatAndMount struct { - mount.Interface + mount.Mounter runner exec.Interface }