github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #12654 from gmarek/playground

Browse Source 
Remove external function setting Kubelet flags
This commit is contained in:
Piotr Szczesniak
2015-08-19 15:48:55 +02:00
parent fde3cf8e91 3c907b33e1
commit fadb59067b
3 changed files with 7 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/client/unversioned/flags.go
View File

@@ -29,12 +29,3 @@ type FlagSet interface {
DurationVar(p *time.Duration, name string, value time.Duration, usage string)
IntVar(p *int, name string, value int, usage string)
}
func BindKubeletClientConfigFlags(flags FlagSet, config *KubeletConfig) {
flags.BoolVar(&config.EnableHttps, "kubelet-https", config.EnableHttps, "Use https for kubelet connections")
flags.UintVar(&config.Port, "kubelet-port", config.Port, "Kubelet port")
flags.DurationVar(&config.HTTPTimeout, "kubelet-timeout", config.HTTPTimeout, "Timeout for kubelet operations")
flags.StringVar(&config.CertFile, "kubelet-client-certificate", config.CertFile, "Path to a client key file for TLS.")
flags.StringVar(&config.KeyFile, "kubelet-client-key", config.KeyFile, "Path to a client key file for TLS.")
flags.StringVar(&config.CAFile, "kubelet-certificate-authority", config.CAFile, "Path to a cert. file for the certificate authority.")
}

9
pkg/client/unversioned/flags_test.go
View File

@@ -77,12 +77,3 @@ func (f *fakeFlagSet) IntVar(p *int, name string, value int, usage string) {
}
f.set.Insert(name)
}
func TestBindKubeletClientConfigFlags(t *testing.T) {
flags := &fakeFlagSet{t, util.StringSet{}}
config := &KubeletConfig{}
BindKubeletClientConfigFlags(flags, config)
if len(flags.set) != 6 {
t.Errorf("unexpected flag set: %#v", flags)
}
}