Merge pull request #49139 from deads2k/cli-15-proxy-defaults

Automatic merge from submit-queue (batch tested with PRs 48043, 48200, 49139, 36238, 49130) expose method to allow externally setting defaults on an external type The options are an exposed type. This allows you to set the defaults on them. @derekwaynecarr who normally owns this bit?

Merge pull request #49139 from deads2k/cli-15-proxy-defaults
495f5b26 · Kubernetes Submit Queue · GitHub · cf9f00bb · 41a4faa6 · 495f5b26
Commit 495f5b26 authored Jul 19, 2017 by Kubernetes Submit Queue Committed by GitHub Jul 19, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

server.go cmd/kube-proxy/app/server.go +2 -2

No files found.
--- a/cmd/kube-proxy/app/server.go
+++ b/cmd/kube-proxy/app/server.go
@@ -302,7 +302,7 @@ func (o *Options) loadConfig(data []byte) (*componentconfig.KubeProxyConfigurati
 	return config, nil
 }
-func (o *Options) applyDefaults(in *componentconfig.KubeProxyConfiguration) (*componentconfig.KubeProxyConfiguration, error) {
+func (o *Options) ApplyDefaults(in *componentconfig.KubeProxyConfiguration) (*componentconfig.KubeProxyConfiguration, error) {
 	external, err := o.scheme.ConvertToVersion(in, v1alpha1.SchemeGroupVersion)
 	if err != nil {
 		return nil, err
@@ -344,7 +344,7 @@ with the apiserver API to configure the proxy.`,
 		},
 	}
-	opts.config, err = opts.applyDefaults(opts.config)
+	opts.config, err = opts.ApplyDefaults(opts.config)
 	if err != nil {
 		glog.Fatalf("unable to create flag defaults: %v", err)
 	}