This repository was archived by the owner on Jan 11, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 557
Fix k8s 1.6 regression #2049
Merged
jackfrancis
merged 7 commits into
Azure:master
from
CecileRobertMichon:k8s-1.6-regression
Jan 13, 2018
Merged
Fix k8s 1.6 regression #2049
jackfrancis
merged 7 commits into
Azure:master
from
CecileRobertMichon:k8s-1.6-regression
Jan 13, 2018
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
jackfrancis
reviewed
Jan 12, 2018
@@ -88,7 +88,10 @@ func setAPIServerConfig(cs *api.ContainerService) { | |||
|
|||
// RBAC configuration | |||
if helpers.IsTrueBoolPointer(o.KubernetesConfig.EnableRbac) { | |||
defaultAPIServerConfig["--authorization-mode"] = "Node,RBAC" | |||
defaultAPIServerConfig["--authorization-mode"] = "RBAC" | |||
if isKubernetesVersionGe(o.OrchestratorVersion, "1.7.0") { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We need this same version guard in the defaultAPIServerConfig
assignment above as well.
jackfrancis
approved these changes
Jan 13, 2018
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lgtm
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.
What this PR does / why we need it: Only add Node authorization-mode to default api-server config if the k8s version is greater or equal to 1.7.0
Which issue this PR fixes (optional, in
fixes #<issue number>(, fixes #<issue_number>, ...)
format, will close that issue when PR gets merged): fixes #Special notes for your reviewer:
Release note: