Use kubeconfig in several components #6969
Merged
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
--master flag is still supported for distros that need it. But now, --kubeconfig flag can be used instead, or in addition, to specify the auth info, and/or the location of the master. A subsequent PR will change salt to generate a kubeconfig, and to make kube-proxy use it, for salt-based clouds.
|
@jlowdermilk PTAL |
|
or @deads2k |
| @@ -130,6 +131,8 @@ func (s *CMServer) AddFlags(fs *pflag.FlagSet) { | |||
| fs.Var(resource.NewQuantityFlagValue(&s.NodeMemory), "node_memory", "The amount of memory (in bytes) provisioned on each node") | |||
| fs.StringVar(&s.ClusterName, "cluster_name", s.ClusterName, "The instance prefix for the cluster") | |||
| fs.BoolVar(&s.EnableProfiling, "profiling", false, "Enable profiling via web interface host:port/debug/pprof/") | |||
| fs.StringVar(&s.Master, "master", s.Master, "The address of the Kubernetes API server (overrides any value in kubeconfig)") | |||
There was a problem hiding this comment.
we call this --server in kubectl commands
There was a problem hiding this comment.
Roger. All the existing system components take a --master flag, and I don't want to break existing cluster setups.
There was a problem hiding this comment.
Eventually, I expect this won't be needed since all the info is in the kubeconfig.
|
Okay, PTAL |
| @@ -151,11 +154,23 @@ func (s *CMServer) verifyMinionFlags() { | |||
| func (s *CMServer) Run(_ []string) error { | |||
| s.verifyMinionFlags() | |||
|
|
|||
| if len(s.ClientConfig.Host) == 0 { | |||
| glog.Fatal("usage: controller-manager --master <master>") | |||
| if s.Kubeconfig == "" || s.Master == "" { | |||
|
Double check the warning condition in all three files, but otherwise lgtm. |
--master option still supported. --kubeconfig option added to kube-proxy, kube-scheduler, and kube-controller-manager binaries. Kube-proxy now always makes some kind of API source, since that is its only kind of config. Warn if it is using a default client, which probably won't work. Uses the clientcmd builder.
erictune
force-pushed
the
use_kubeconfig
branch
from
e696c96 to
6081fa5
Compare
|
Thanks for review. Fixed warning conditions. |
|
squashed |
|
@cjcullen PTAL. |
|
has lgtm from deads2k so just needs a glance and a merge. |
|
lgtm |
j3ffml
added a commit
that referenced
this pull request
Apr 17, 2015
Use kubeconfig in several components
|
thx |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
kube-proxy, kube-controller-manager, and kube-scheduler learn how to
read a kubeconfig file, via the
--kubeconfigflagThey continue to support the
--master flag, which is used by all distros.They forget these flags:
--api_version, --insecure_skip_tls_verify, --client_certificate, --client_key, --certificate_authority, --max_outgoing_qps, --max_outgoing_burst, but there was no config in the repo using those flags, and we can set them in the kubeconfig if we need to.I've manually tested that the binaries can read kubeconfigs, but I'll modify their config to actually use the kubeconfigs in a subsequent PR.
My cluster passes validation with this PR.