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

add Merge function for v20180331 to guard update scenario #2653

Merged
merged 2 commits into from
Apr 11, 2018

Conversation

rjtsdl
Copy link
Contributor

@rjtsdl rjtsdl commented Apr 10, 2018

What this PR does / why we need it:

Which issue this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close that issue when PR gets merged): fixes #2646

Special notes for your reviewer:
following #2647, this PR is to add validation on update scenario. So we catch all the cases when enableRBAC could possibly be changed. And return as error

If applicable:

  • documentation
  • unit tests
  • tested backward compatibility (ie. deploy with previous version, upgrade with this branch)

Release note:

@ghost ghost assigned rjtsdl Apr 10, 2018
@ghost ghost added the in progress label Apr 10, 2018
@rjtsdl rjtsdl requested a review from weinong April 10, 2018 23:04
@rjtsdl rjtsdl force-pushed the jiren-addvalidationforrbac branch from 2faca07 to 1410195 Compare April 10, 2018 23:08
version string,
validate, isUpdate bool,
defaultKubernetesVersion string,
existingContainerService *ContainerService) (*ContainerService, bool, error) {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Need to update RP when vendor this change. Just a simple change.

@rjtsdl rjtsdl force-pushed the jiren-addvalidationforrbac branch from 1410195 to 92229f6 Compare April 10, 2018 23:19
@weinong
Copy link
Contributor

weinong commented Apr 10, 2018

DNSPrefix will need to be optional. Otherwise, it will fail at here
Can you also merge DNSPrefix?

@rjtsdl
Copy link
Contributor Author

rjtsdl commented Apr 10, 2018

@weinong can we do in a different PR?
I set up the framework here, then @zqingqing1 can add other fields needed to be merged, and also unittests.

Synced, I will just add dnsPrefix merge in this PR as well.

@jackfrancis jackfrancis merged commit 8771289 into Azure:master Apr 11, 2018
@ghost ghost removed the in progress label Apr 11, 2018
jackfrancis pushed a commit that referenced this pull request Apr 11, 2018
* add Merge function for v20180331 to guard update scenario

* add merge for properties.dnsPrefix
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Need to add EnableRBAC as a flag in v20180331 api model
3 participants