github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-03 10:17:46 +00:00
Code Issues Projects Releases Wiki Activity

Set default vmtype to standard if not set

Browse Source
This commit is contained in:
Pengfei Ni
2018-03-01 13:48:54 +08:00
parent 07240b7166
commit ce8615dab6
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -160,6 +160,11 @@ func NewCloud(configReader io.Reader) (cloudprovider.Interface, error) {
return nil, err return nil, err
} }
if config.VMType == "" {
// default to standard vmType if not set.
config.VMType = vmTypeStandard
}
env, err := auth.ParseAzureEnvironment(config.Cloud) env, err := auth.ParseAzureEnvironment(config.Cloud)
if err != nil { if err != nil {
return nil, err return nil, err

1
pkg/cloudprovider/providers/azure/azure_test.go
View File

@@ -864,6 +864,7 @@ func getTestCloud() (az *Cloud) {
RouteTableName: "rt", RouteTableName: "rt",
PrimaryAvailabilitySetName: "as", PrimaryAvailabilitySetName: "as",
MaximumLoadBalancerRuleCount: 250, MaximumLoadBalancerRuleCount: 250,
VMType: vmTypeStandard,
}, },
} }
az.DisksClient = newFakeDisksClient() az.DisksClient = newFakeDisksClient()