From b61fc222bb661dbb6d161087c1e06a9794dd346e Mon Sep 17 00:00:00 2001 From: Justin Santa Barbara Date: Thu, 2 Apr 2015 10:14:06 -0700 Subject: [PATCH] Make AWS configuration file optional (fall-back to metadata service) --- pkg/cloudprovider/aws/aws.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkg/cloudprovider/aws/aws.go b/pkg/cloudprovider/aws/aws.go index 7d516c96bce..9eb7fe7929e 100644 --- a/pkg/cloudprovider/aws/aws.go +++ b/pkg/cloudprovider/aws/aws.go @@ -119,14 +119,14 @@ func getAuth() (auth aws.Auth, err error) { // readAWSCloudConfig reads an instance of AWSCloudConfig from config reader. func readAWSCloudConfig(config io.Reader, metadata AWSMetadata) (*AWSCloudConfig, error) { - if config == nil { - return nil, fmt.Errorf("no AWS cloud provider config file given") - } - var cfg AWSCloudConfig - err := gcfg.ReadInto(&cfg, config) - if err != nil { - return nil, err + var err error + + if config != nil { + err = gcfg.ReadInto(&cfg, config) + if err != nil { + return nil, err + } } if cfg.Global.Zone == "" {