Merge pull request #47399 from justinsb/fix_41904

Automatic merge from submit-queue (batch tested with PRs 46929, 47391, 47399, 47428, 47274) AWS: Richer log message when metadata fails Not a resolution, but should at least help determine the issue. Issue #41904 ```release-note NONE ```

Merge pull request #47399 from justinsb/fix_41904
48bea51d · Kubernetes Submit Queue · GitHub · d216cfc4 · 9d8a721b · 48bea51d
Commit 48bea51d authored Jun 13, 2017 by Kubernetes Submit Queue Committed by GitHub Jun 13, 2017
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

aws.go pkg/cloudprovider/providers/aws/aws.go +1 -1

No files found.
--- a/pkg/cloudprovider/providers/aws/aws.go
+++ b/pkg/cloudprovider/providers/aws/aws.go
@@ -948,7 +948,7 @@ func (c *Cloud) NodeAddresses(name types.NodeName) ([]v1.NodeAddress, error) {

 		internalIP, err := c.metadata.GetMetadata("local-ipv4")
 		if err != nil {
-			return nil, err
+			return nil, fmt.Errorf("error querying AWS metadata for %q: %v", "local-ipv4", err)
 		}
 		addresses = append(addresses, v1.NodeAddress{Type: v1.NodeInternalIP, Address: internalIP})