Skip to content
This repository has been archived by the owner on Oct 24, 2023. It is now read-only.

refactor: Remove agentpool index usage from function which gets agent VM name #428

Merged
merged 1 commit into from
Feb 4, 2019
Merged

refactor: Remove agentpool index usage from function which gets agent VM name #428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 6 additions & 6 deletions pkg/armhelpers/utils/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,12 +150,12 @@ func GetVMNameIndex(osType compute.OperatingSystemTypes, vmName string) (int, er
}

// GetK8sVMName reconstructs the VM name
func GetK8sVMName(p *api.Properties, agentPoolIndex, agentIndex int) (string, error) {
if len(p.AgentPoolProfiles) > agentPoolIndex {
vmPrefix := p.GetAgentVMPrefix(p.AgentPoolProfiles[agentPoolIndex])
if vmPrefix != "" {
return vmPrefix + strconv.Itoa(agentIndex), nil
}
func GetK8sVMName(p *api.Properties, agentPoolProfile *api.AgentPoolProfile, agentIndex int) (string, error) {

vmPrefix := p.GetAgentVMPrefix(agentPoolProfile)
if vmPrefix != "" {
return vmPrefix + strconv.Itoa(agentIndex), nil
}

return "", errors.Errorf("Failed to reconstruct VM Name")
}
3 changes: 1 addition & 2 deletions pkg/armhelpers/utils/util_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,9 +177,8 @@ func Test_GetK8sVMName(t *testing.T) {
}{
{properties: p, agentPoolIndex: 0, agentIndex: 2, expected: "aks-linux1-28513887-2", expectedErr: false},
{properties: p, agentPoolIndex: 1, agentIndex: 1, expected: "2851aks011", expectedErr: false},
{properties: p, agentPoolIndex: 3, agentIndex: 0, expected: "", expectedErr: true},
} {
vmName, err := GetK8sVMName(s.properties, s.agentPoolIndex, s.agentIndex)
vmName, err := GetK8sVMName(s.properties, p.AgentPoolProfiles[s.agentPoolIndex], s.agentIndex)

if !s.expectedErr {
if err != nil {
Expand Down
11 changes: 6 additions & 5 deletions pkg/operations/kubernetesupgrade/upgrader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,11 +228,12 @@ func (ku *Upgrader) upgradeAgentPools(ctx context.Context) error {
return ku.Translator.Errorf("Error generating upgrade template: %s", err.Error())
}

var agentCount, agentPoolIndex int
for indx, app := range ku.ClusterTopology.DataModel.Properties.AgentPoolProfiles {
var agentCount int
var agentPoolProfile *api.AgentPoolProfile
for _, app := range ku.ClusterTopology.DataModel.Properties.AgentPoolProfiles {
if app.Name == *agentPool.Name {
agentCount = app.Count
agentPoolIndex = indx
agentPoolProfile = app
break
}
}
Expand Down Expand Up @@ -315,7 +316,7 @@ func (ku *Upgrader) upgradeAgentPools(ctx context.Context) error {
for upgradedCount+toBeUpgradedCount < agentCount {
agentIndex := getAvailableIndex(agentVMs)

vmName, err := utils.GetK8sVMName(ku.DataModel.Properties, agentPoolIndex, agentIndex)
vmName, err := utils.GetK8sVMName(ku.DataModel.Properties, agentPoolProfile, agentIndex)
if err != nil {
ku.logger.Errorf("Error reconstructing agent VM name with index %d: %v", agentIndex, err)
return err
Expand Down Expand Up @@ -357,7 +358,7 @@ func (ku *Upgrader) upgradeAgentPools(ctx context.Context) error {
return err
}

vmName, err := utils.GetK8sVMName(ku.DataModel.Properties, agentPoolIndex, agentIndex)
vmName, err := utils.GetK8sVMName(ku.DataModel.Properties, agentPoolProfile, agentIndex)
if err != nil {
ku.logger.Errorf("Error fetching new VM name: %v", err)
return err
Expand Down