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

Conversation

@yangl900
Copy link
Contributor

@yangl900 yangl900 commented Jul 18, 2019

Reason for Change:

VMSS upgrade path used a template normalization, which removes OS image reference. This doesn't seem right because we expect OS image version get updated from previous version. Also the scaling normalization is only called by upgrade path, this alone is very weird...

Issue Fixed:

Fixes #1638

Requirements:

Notes:

@mboersma
Copy link
Member

/azp run pr-e2e

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@mboersma
Copy link
Member

mboersma commented Jul 18, 2019

Thanks @yangl900!

make test-style is complaining about unused constants:

==> Running Go linter <==
golangci-lint has version 1.17.1 built from 4ba2155 on 2019-06-10T09:06:49Z
Running inside container
pkg/engine/transform/transform.go:28:2: U1000: const `virtualMachineProfileFieldName` is unused (unused)
	virtualMachineProfileFieldName = "virtualMachineProfile"
	^
pkg/engine/transform/transform.go:40:2: U1000: const `vmssResourceType` is unused (unused)
	vmssResourceType = "Microsoft.Compute/virtualMachineScaleSets"
	^

@mboersma
Copy link
Member

/azp run pr-e2e

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@CecileRobertMichon
Copy link
Contributor

/azp run pr-e2e

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@yangl900
Copy link
Contributor Author

make test-style passed:

==> Running Go linter <==
golangci-lint has version 1.17.1 built from 4ba2155 on 2019-06-10T09:06:49Z
==> Running shell linter <==
ShellCheck - shell script analysis tool
version: 0.6.0
license: GNU General Public License, version 3
website: https://www.shellcheck.net
==> Checking copyright headers <==

@codecov
Copy link

codecov bot commented Jul 18, 2019

Codecov Report

Merging #1633 into master will increase coverage by 0.04%.
The diff coverage is 0%.

@@            Coverage Diff             @@
##           master    #1633      +/-   ##
==========================================
+ Coverage   76.31%   76.36%   +0.04%     
==========================================
  Files         129      129              
  Lines       18727    18703      -24     
==========================================
- Hits        14292    14282      -10     
+ Misses       3652     3643       -9     
+ Partials      783      778       -5

@yangl900
Copy link
Contributor Author

added #1638 for tracking.

Copy link
Contributor

@CecileRobertMichon CecileRobertMichon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@acs-bot
Copy link

acs-bot commented Jul 18, 2019

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: CecileRobertMichon, yangl900

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment


if err = transformer.NormalizeForVMSSScaling(ku.logger, templateMap); err != nil {
ku.logger.Errorf("unable to update template, error: %v.", err)
if err = transformer.NormalizeMasterResourcesForScaling(ku.logger, templateMap); err != nil {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

NormalizeMasterResourcesForScaling doesn't have a unit test and wasn't actually called anywhere (here or in AKS). But NormalizeForVMSSScaling is called in AKS' arminteractor.go. Is the plan to switch that usage as well? (Could we add a unit test? Maybe copy-and-paste from TestNormalizeForVMSSScaling would almost do it.)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See #1645

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, I actually prepared a unit test yesterday, but didn't finish. :) Will send a PR today.

The caller at AKS side is actually ACS only, so it's on deprecation path.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

VMSS agentpool upgrade doesn't update OS image version

4 participants