github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-02 16:29:21 +00:00
Code Issues Projects Releases Wiki Activity

fix bug when azure cloud provider configuration file is not specified

Browse Source
This commit is contained in:
Di Xu 2017-07-20 17:29:09 +08:00
parent acc19cafa4
commit 2cddfd0db9
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/cloudprovider/providers/azure/azure.go
View File

@ -327,6 +327,11 @@ func NewCloud(configReader io.Reader) (cloudprovider.Interface, error) {
// ParseConfig returns a parsed configuration and azure.Environment for an Azure cloudprovider config file // ParseConfig returns a parsed configuration and azure.Environment for an Azure cloudprovider config file
func ParseConfig(configReader io.Reader) (*Config, *azure.Environment, error) { func ParseConfig(configReader io.Reader) (*Config, *azure.Environment, error) {
var config Config var config Config
var env azure.Environment
if configReader == nil {
return &config, &env, nil
}
configContents, err := ioutil.ReadAll(configReader) configContents, err := ioutil.ReadAll(configReader)
if err != nil { if err != nil {
@ -337,7 +342,6 @@ func ParseConfig(configReader io.Reader) (*Config, *azure.Environment, error) {
return nil, nil, err return nil, nil, err
} }
var env azure.Environment
if config.Cloud == "" { if config.Cloud == "" {
env = azure.PublicCloud env = azure.PublicCloud
} else { } else {