From 6fe614efa7084d9d1ff9a2000b66dbba71564fcc Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Wed, 15 May 2019 11:34:21 -0700 Subject: [PATCH] Fix stutter between the package name and the function --- pkg/minikube/proxy/proxy.go | 4 ++-- pkg/minikube/service/service.go | 2 +- pkg/util/kubernetes.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/minikube/proxy/proxy.go b/pkg/minikube/proxy/proxy.go index 7cb9405d5d..70b6355745 100644 --- a/pkg/minikube/proxy/proxy.go +++ b/pkg/minikube/proxy/proxy.go @@ -111,8 +111,8 @@ func isValidEnv(env string) bool { return false } -// SetNoProxyK8s takes a k8s config and upadates the proxy -func SetNoProxyK8s(cfg *rest.Config) *rest.Config { +// UpdateConfigTranport takes a k8s rest config and returns a config without a proxy. +func UpdateConfigTranport(cfg *rest.Config) *rest.Config { wt := cfg.WrapTransport // Config might already have a transport wrapper cfg.WrapTransport = func(rt http.RoundTripper) http.RoundTripper { if wt != nil { diff --git a/pkg/minikube/service/service.go b/pkg/minikube/service/service.go index 1423d6a5ea..23d356fbf6 100644 --- a/pkg/minikube/service/service.go +++ b/pkg/minikube/service/service.go @@ -85,7 +85,7 @@ func (*K8sClientGetter) GetClientset(timeout time.Duration) (*kubernetes.Clients return nil, fmt.Errorf("Error creating kubeConfig: %v", err) } clientConfig.Timeout = timeout - clientConfig = proxy.SetNoProxyK8s(clientConfig) + clientConfig = proxy.UpdateConfigTranport(clientConfig) client, err := kubernetes.NewForConfig(clientConfig) if err != nil { return nil, errors.Wrap(err, "Error creating new client from kubeConfig.ClientConfig()") diff --git a/pkg/util/kubernetes.go b/pkg/util/kubernetes.go index fe801b25f2..5bf4dea64c 100644 --- a/pkg/util/kubernetes.go +++ b/pkg/util/kubernetes.go @@ -77,7 +77,7 @@ func GetClient() (kubernetes.Interface, error) { if err != nil { return nil, fmt.Errorf("Error creating kubeConfig: %v", err) } - config = proxy.SetNoProxyK8s(config) + config = proxy.UpdateConfigTranport(config) client, err := kubernetes.NewForConfig(config) if err != nil { return nil, errors.Wrap(err, "Error creating new client from kubeConfig.ClientConfig()")