From fcda3556cd54c3d0eb8f212e8f47b6946f639e42 Mon Sep 17 00:00:00 2001 From: Michael Schmidt Date: Thu, 10 Sep 2015 10:14:16 +0200 Subject: [PATCH] pass cloudProvider from Kubelet to volume plugins --- pkg/volume/aws_ebs/aws_ebs.go | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pkg/volume/aws_ebs/aws_ebs.go b/pkg/volume/aws_ebs/aws_ebs.go index ecada1a28af..7ee829e82b3 100644 --- a/pkg/volume/aws_ebs/aws_ebs.go +++ b/pkg/volume/aws_ebs/aws_ebs.go @@ -26,7 +26,6 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/cloudprovider" "k8s.io/kubernetes/pkg/cloudprovider/providers/aws" "k8s.io/kubernetes/pkg/types" "k8s.io/kubernetes/pkg/util" @@ -156,11 +155,7 @@ func detachDiskLogError(ebs *awsElasticBlockStore) { // getVolumeProvider returns the AWS Volumes interface func (ebs *awsElasticBlockStore) getVolumeProvider() (aws_cloud.Volumes, error) { - name := "aws" - cloud, err := cloudprovider.GetCloudProvider(name, nil) - if err != nil { - return nil, err - } + cloud := ebs.plugin.host.GetCloudProvider() volumes, ok := cloud.(aws_cloud.Volumes) if !ok { return nil, fmt.Errorf("Cloud provider does not support volumes")