From 503e19e58ce92b356d6ca35fe3d8fdcdeaaba269 Mon Sep 17 00:00:00 2001 From: Justin Santa Barbara Date: Thu, 9 Apr 2015 06:40:48 -0700 Subject: [PATCH] Rename aws_pd -> aws_ebs --- cmd/kubelet/app/plugins.go | 4 ++-- pkg/volume/{aws_pd => aws_ebs}/aws_pd.go | 2 +- pkg/volume/{aws_pd => aws_ebs}/aws_pd_test.go | 2 +- pkg/volume/{aws_pd => aws_ebs}/aws_util.go | 2 +- pkg/volume/{aws_pd => aws_ebs}/aws_util_test.go | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) rename pkg/volume/{aws_pd => aws_ebs}/aws_pd.go (99%) rename pkg/volume/{aws_pd => aws_ebs}/aws_pd_test.go (99%) rename pkg/volume/{aws_pd => aws_ebs}/aws_util.go (99%) rename pkg/volume/{aws_pd => aws_ebs}/aws_util_test.go (99%) diff --git a/cmd/kubelet/app/plugins.go b/cmd/kubelet/app/plugins.go index bd522f7cf5e..d0dd25498dc 100644 --- a/cmd/kubelet/app/plugins.go +++ b/cmd/kubelet/app/plugins.go @@ -25,7 +25,7 @@ import ( "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/network/exec" // Volume plugins "github.com/GoogleCloudPlatform/kubernetes/pkg/volume" - "github.com/GoogleCloudPlatform/kubernetes/pkg/volume/aws_pd" + "github.com/GoogleCloudPlatform/kubernetes/pkg/volume/aws_ebs" "github.com/GoogleCloudPlatform/kubernetes/pkg/volume/empty_dir" "github.com/GoogleCloudPlatform/kubernetes/pkg/volume/gce_pd" "github.com/GoogleCloudPlatform/kubernetes/pkg/volume/git_repo" @@ -50,7 +50,7 @@ func ProbeVolumePlugins() []volume.VolumePlugin { // The list of plugins to probe is decided by the kubelet binary, not // by dynamic linking or other "magic". Plugins will be analyzed and // initialized later. - allPlugins = append(allPlugins, aws_pd.ProbeVolumePlugins()...) + allPlugins = append(allPlugins, aws_ebs.ProbeVolumePlugins()...) allPlugins = append(allPlugins, empty_dir.ProbeVolumePlugins()...) allPlugins = append(allPlugins, gce_pd.ProbeVolumePlugins()...) allPlugins = append(allPlugins, git_repo.ProbeVolumePlugins()...) diff --git a/pkg/volume/aws_pd/aws_pd.go b/pkg/volume/aws_ebs/aws_pd.go similarity index 99% rename from pkg/volume/aws_pd/aws_pd.go rename to pkg/volume/aws_ebs/aws_pd.go index 5ec913299e5..e6351c230e6 100644 --- a/pkg/volume/aws_pd/aws_pd.go +++ b/pkg/volume/aws_ebs/aws_pd.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package aws_pd +package aws_ebs import ( "fmt" diff --git a/pkg/volume/aws_pd/aws_pd_test.go b/pkg/volume/aws_ebs/aws_pd_test.go similarity index 99% rename from pkg/volume/aws_pd/aws_pd_test.go rename to pkg/volume/aws_ebs/aws_pd_test.go index 5444d1aef1b..c6fb7a9a3d2 100644 --- a/pkg/volume/aws_pd/aws_pd_test.go +++ b/pkg/volume/aws_ebs/aws_pd_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package aws_pd +package aws_ebs import ( "os" diff --git a/pkg/volume/aws_pd/aws_util.go b/pkg/volume/aws_ebs/aws_util.go similarity index 99% rename from pkg/volume/aws_pd/aws_util.go rename to pkg/volume/aws_ebs/aws_util.go index 8e3a0c6abc0..22d8a3fdf30 100644 --- a/pkg/volume/aws_pd/aws_util.go +++ b/pkg/volume/aws_ebs/aws_util.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package aws_pd +package aws_ebs import ( "errors" diff --git a/pkg/volume/aws_pd/aws_util_test.go b/pkg/volume/aws_ebs/aws_util_test.go similarity index 99% rename from pkg/volume/aws_pd/aws_util_test.go rename to pkg/volume/aws_ebs/aws_util_test.go index fc8970426be..82dfd19b9be 100644 --- a/pkg/volume/aws_pd/aws_util_test.go +++ b/pkg/volume/aws_ebs/aws_util_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package aws_pd +package aws_ebs import ( "fmt"