github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-01 15:58:37 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #13784 from BugRoger/aws_ebs_picks_up_kubelet_cloud_provider

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2015-09-14 22:25:16 -07:00
commit dc1561fbca
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/volume/aws_ebs/aws_ebs.go
View File

@ -26,7 +26,6 @@ import (
"github.com/golang/glog" "github.com/golang/glog"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/cloudprovider"
"k8s.io/kubernetes/pkg/cloudprovider/providers/aws" "k8s.io/kubernetes/pkg/cloudprovider/providers/aws"
"k8s.io/kubernetes/pkg/types" "k8s.io/kubernetes/pkg/types"
"k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/util"
@ -156,11 +155,7 @@ func detachDiskLogError(ebs *awsElasticBlockStore) {
// getVolumeProvider returns the AWS Volumes interface // getVolumeProvider returns the AWS Volumes interface
func (ebs *awsElasticBlockStore) getVolumeProvider() (aws_cloud.Volumes, error) { func (ebs *awsElasticBlockStore) getVolumeProvider() (aws_cloud.Volumes, error) {
name := "aws" cloud := ebs.plugin.host.GetCloudProvider()
cloud, err := cloudprovider.GetCloudProvider(name, nil)
if err != nil {
return nil, err
}
volumes, ok := cloud.(aws_cloud.Volumes) volumes, ok := cloud.(aws_cloud.Volumes)
if !ok { if !ok {
return nil, fmt.Errorf("Cloud provider does not support volumes") return nil, fmt.Errorf("Cloud provider does not support volumes")