Skip to content

Commit

Permalink
Merge pull request #4214 from feiskyer/default-vmss
Browse files Browse the repository at this point in the history
feat: make vmType optional
  • Loading branch information
k8s-ci-robot committed Jul 4, 2023
2 parents 6b74d27 + 0fd1120 commit 545a717
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions pkg/provider/azure.go
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,8 @@ type Config struct {
// the cloudprovider will try to add all nodes to a single backend pool which is forbidden.
// In other words, if you use multiple agent pools (availability sets), you MUST set this field.
PrimaryAvailabilitySetName string `json:"primaryAvailabilitySetName,omitempty" yaml:"primaryAvailabilitySetName,omitempty"`
// The type of azure nodes. Candidate values are: vmss and standard.
// If not set, it will be default to standard.
// The type of azure nodes. Candidate values are: vmss, standard and vmssflex.
// If not set, it will be default to vmss.
VMType string `json:"vmType,omitempty" yaml:"vmType,omitempty"`
// The name of the scale set that should be used as the load balancer backend.
// If this is set, the Azure cloudprovider will only add nodes from that scale set to the load
Expand Down Expand Up @@ -556,8 +556,8 @@ func (az *Cloud) InitializeCloudFromConfig(ctx context.Context, config *Config,
}

if config.VMType == "" {
// default to standard vmType if not set.
config.VMType = consts.VMTypeStandard
// default to vmss vmType if not set.
config.VMType = consts.VMTypeVMSS
}

if config.RouteUpdateWaitingInSeconds <= 0 {
Expand Down

0 comments on commit 545a717

Please sign in to comment.