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

fix: correct defaults order for setting IPAddressCount #2358

Merged
merged 3 commits into from
Nov 23, 2019

Conversation

jackfrancis
Copy link
Member

@jackfrancis jackfrancis commented Nov 22, 2019

Reason for Change:

This fixes a regression that landed w/ #2274

The functional bug is this:

If you are using Azure CNI, and you are specifying a custom IPAddressCount for either master vm nodes or any node pool vms, those user-provided values will be overwritten by the aks-engine defaults.

The IPAddressCount values in MasterProfile and each AgentPoolProfile depend (in part) upon the kublet configuration --max-pods; essentially these values are related and need to be configured in concert according to a deterministic ordinality.

This PR moves the IPAddressCount default enforcement for both masters and pools to occur after the kubelet defaults codeflow.

The primary fix here is missing UT. :(

Issue Fixed:

Requirements:

Notes:

mboersma
mboersma previously approved these changes Nov 22, 2019
Copy link
Member

@mboersma mboersma left a comment

Choose a reason for hiding this comment

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

/lgtm

@jackfrancis
Copy link
Member Author

Manually confirmed that had the UT added in this PR been in place prior to #2274 this bug would not have landed. Tears.

@mboersma
Copy link
Member

/lgtm

@acs-bot acs-bot added the lgtm label Nov 23, 2019
@codecov
Copy link

codecov bot commented Nov 23, 2019

Codecov Report

Merging #2358 into master will increase coverage by <.01%.
The diff coverage is 100%.

@@            Coverage Diff             @@
##           master    #2358      +/-   ##
==========================================
+ Coverage    71.9%   71.91%   +<.01%     
==========================================
  Files         130      130              
  Lines       23395    23397       +2     
==========================================
+ Hits        16823    16825       +2     
  Misses       5546     5546              
  Partials     1026     1026

@acs-bot
Copy link

acs-bot commented Nov 23, 2019

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jackfrancis, mboersma

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

The pull request process is described here

Needs approval from an approver in each of these files:
  • OWNERS [jackfrancis,mboersma]

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

@jackfrancis jackfrancis merged commit 0164204 into Azure:master Nov 23, 2019
@jackfrancis jackfrancis deleted the fix-ipaddresscount-defaults branch November 23, 2019 03:08
@jackfrancis jackfrancis added this to the v0.45.0 milestone Dec 16, 2019
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.

None yet

3 participants