Skip to content

Commit

Permalink
Fix empty vmType (#755)
Browse files Browse the repository at this point in the history
  • Loading branch information
oliver-goetz authored Nov 23, 2023
1 parent 9d7d4ab commit 21c1c67
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
3 changes: 1 addition & 2 deletions pkg/controller/controlplane/valuesprovider.go
Original file line number Diff line number Diff line change
Expand Up @@ -486,17 +486,16 @@ func getConfigChartValues(infraStatus *apisazure.InfrastructureStatus, cp *exten
}

func appendMachineSetValues(values map[string]interface{}, infraStatus *apisazure.InfrastructureStatus) map[string]interface{} {
values["vmType"] = "standard"
if azureapihelper.IsVmoRequired(infraStatus) {
values["vmType"] = "vmss"
return values
}

if primaryAvailabilitySet, err := azureapihelper.FindAvailabilitySetByPurpose(infraStatus.AvailabilitySets, apisazure.PurposeNodes); err == nil {
values["availabilitySetName"] = primaryAvailabilitySet.Name
return values
}

values["vmType"] = "standard"
return values
}

Expand Down
1 change: 1 addition & 0 deletions pkg/controller/controlplane/valuesprovider_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,7 @@ var _ = Describe("ValuesProvider", func() {
"routeTableName": "route-table-name",
"securityGroupName": "security-group-name-workers",
"maxNodes": maxNodes,
"vmType": "standard",
}))
})

Expand Down

0 comments on commit 21c1c67

Please sign in to comment.