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

fix: do not override vnetCidr param when empty string #1570

Merged
merged 1 commit into from Jul 5, 2019

Conversation

CecileRobertMichon
Copy link
Contributor

Reason for Change:

azuredeploy.json

"vnetCidr": {
  "defaultValue": "10.0.0.0/8",
  "metadata": {
    "description": "Cluster vnet cidr"
  },
  "type": "string"
},

azuredeploy.parameters.json overrides this with the empty string which results in an empty vnetCidr.

Issue Fixed:

#1550

Requirements:

Notes:

@CecileRobertMichon
Copy link
Contributor Author

@CecileRobertMichon
Copy link
Contributor Author

I have another attempt at rationalizing the vnetCidr defaults and using apimodel defaults instead of ARM param defaults but it's more complex so I'd rather start with this PR as an easy, straightforward fix.

@codecov
Copy link

codecov bot commented Jul 3, 2019

Codecov Report

Merging #1570 into master will not change coverage.
The diff coverage is 100%.

@@           Coverage Diff           @@
##           master    #1570   +/-   ##
=======================================
  Coverage   76.06%   76.06%           
=======================================
  Files         129      129           
  Lines       18572    18572           
=======================================
  Hits        14127    14127           
  Misses       3655     3655           
  Partials      790      790

@Alwandy
Copy link
Contributor

Alwandy commented Jul 5, 2019

@CecileRobertMichon first fix looks good to me,

2nd fix looks OK, assuming that it will merge with the 1st fix? Or any reason why you won't be setting:
if properties.OrchestratorProfile.IsKubernetes() && properties.MasterProfile.VnetCidr != "" on 2nd fix?

@PatrickLang
Copy link
Contributor

/lgtm

@acs-bot acs-bot added the lgtm label Jul 5, 2019
@acs-bot acs-bot merged commit 54a0fb8 into Azure:master Jul 5, 2019
@acs-bot
Copy link

acs-bot commented Jul 5, 2019

[APPROVALNOTIFIER] This PR is APPROVED

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

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:

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

@PatrickLang
Copy link
Contributor

I think this fix makes the most sense - we shouldn't set an empty parameter that overrides the variables default.

For the second approach - I don't see why there's an if (windows) type decision tree. We should be passing the same networking parameters down to both Windows & Linux nodes and I would rather aim to get those consistent.

@PatrickLang
Copy link
Contributor

this is included in https://github.com/Azure/aks-engine/releases/tag/v0.38.0 :)

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

4 participants