github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 19:31:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #27793 from justinsb/fix_27774

Browse Source 
Automatic merge from submit-queue

AWS: Add missing error check for #27774

There was an error check missing, which seems likely to have caused 27774

Issue #27774
This commit is contained in:
k8s-merge-robot 2016-06-21 16:21:20 -07:00 committed by GitHub
commit ff583762f9
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/cloudprovider/providers/aws/aws.go
View File

@ -1483,6 +1483,9 @@ func (c *AWSCloud) GetDiskPath(volumeName string) (string, error) {
// Implement Volumes.DiskIsAttached
func (c *AWSCloud) DiskIsAttached(diskName, instanceID string) (bool, error) {
awsInstance, err := c.getAwsInstance(instanceID)
if err != nil {
return false, err
}
info, err := awsInstance.describeInstance()
if err != nil {