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

Fix k8s 1.6 regression #2049

Merged
merged 7 commits into from
Jan 13, 2018
Merged

Fix k8s 1.6 regression #2049

merged 7 commits into from
Jan 13, 2018

Conversation

CecileRobertMichon
Copy link
Contributor

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:

@ghost ghost added the in progress label 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") {
Copy link
Member

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.

Copy link
Member

@jackfrancis jackfrancis 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 jackfrancis merged commit 65d98f4 into Azure:master Jan 13, 2018
@ghost ghost removed the in progress label Jan 13, 2018
@brendandburns
Copy link
Member

brendandburns commented Jan 16, 2018 via email

@CecileRobertMichon CecileRobertMichon deleted the k8s-1.6-regression branch January 16, 2018 22:42
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.

3 participants