This repository has been archived by the owner on Jan 11, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 562
master and agent kubelet config #1954
Merged
jackfrancis
merged 6 commits into
Azure:master
from
CecileRobertMichon:agent-master-kubeconfig
Dec 20, 2017
Merged
master and agent kubelet config #1954
jackfrancis
merged 6 commits into
Azure:master
from
CecileRobertMichon:agent-master-kubeconfig
Dec 20, 2017
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
ghost
assigned CecileRobertMichon
Dec 20, 2017
ghost
added
the
in progress
label
Dec 20, 2017
jackfrancis
reviewed
Dec 20, 2017
pkg/acsengine/engine.go
Outdated
@@ -873,8 +873,14 @@ func (t *TemplateGenerator) getTemplateFuncMap(cs *api.ContainerService) templat | |||
} | |||
return buf.String() | |||
}, | |||
"GetKubeletConfigKeyVals": func() string { | |||
"GetKubeletConfigKeyVals": func(profile *api.AgentPoolProfile) string { |
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.
I think we should change the function arg here to a *api.KubernetesConfig
, and just make this a simple string convenience function (look for a KubeletConfig
of type map[string]string
, and then concatenate all the key/vals together).
We then move all the "what type of KubernetesConfig are you?" logic to the caller, and not inside the function.
What am I missing that would suggest we should do it this way instead?
jackfrancis
approved these changes
Dec 20, 2017
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: Adds ability to override kubelet config with agent and master specific kubelet configs. This is needed to be able to disable cloud provider on agent kubelets.
Which issue this PR fixes (optional, in
fixes #<issue number>(, fixes #<issue_number>, ...)
format, will close that issue when PR gets merged): fixes #1917Special notes for your reviewer:
Release note: