This repository has been archived by the owner on Oct 24, 2023. It is now read-only.
fix: ensure correct agent pool selection in scale operations #4851
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jadarsie
reviewed
Mar 2, 2022
cmd/scale_test.go
Outdated
| agentPoolIndex: 0, | ||
| agentPoolToScale: "linuxpool", | ||
| agentPool: &api.AgentPoolProfile{ | ||
| Name: "linuxpool2", |
There was a problem hiding this comment.
I am not sure you can find yourself in a situation where sc.agentPoolToScale and sc.agentPool.Name are different: https://github.com/Azure/aks-engine/blob/master/cmd/scale.go#L204-L227
There was a problem hiding this comment.
Updated agentPool.Name
| @@ -135,3 +136,106 @@ func TestScaleCmdValidate(t *testing.T) { | |||
| }) | |||
| } | |||
| } | |||
|
|
|||
| func TestVmInVMASAgentPool(t *testing.T) { | |||
There was a problem hiding this comment.
it seems we are missing a case where agentPoolToScale is the empty string
There was a problem hiding this comment.
agentPoolToScale empty string case should have been covered by these lines (https://github.com/Azure/aks-engine/blob/master/cmd/scale.go#L209-L211)
jadarsie
approved these changes
Mar 3, 2022
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Reason for Change:
When there are multiple Windows / Linux agent pools, the scale operation is not selecting the correct agent pool.
For Windows agent pools, the code
vmName[:9] == sc.containerService.Properties.GetAgentVMPrefix(sc.agentPool, winPoolIndex)[:9]will always be true and thus all Windows agent pools will be mixed in scaling and indexing.For Linux agent pools, for example if one agentpool is named
linuxpooland the other agentpool is namedlinxpool2, and scale operation targetslinuxpool, then codestrings.Contains(vmName, sc.agentPoolToScale)will also consider VMs fromlinuxpool2are in agentpoollinuxpool.Issue Fixed:
#1065
Credit Where Due:
Does this change contain code from or inspired by another project?
If "Yes," did you notify that project's maintainers and provide attribution?
Requirements:
Notes: