From c22d855612bb6519de520ba2e63427b3ad619220 Mon Sep 17 00:00:00 2001
From: Vallery Lancey <vallerylancey@gmail.com>
Date: Sun, 27 Jan 2019 15:26:25 -0800
Subject: [PATCH] Renamed variables colliding with package names, and added
 TODOs on uncaught-errors

---
 cmd/kube-proxy/app/server.go | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/cmd/kube-proxy/app/server.go b/cmd/kube-proxy/app/server.go
index ad423413902..e986829009d 100644
--- a/cmd/kube-proxy/app/server.go
+++ b/cmd/kube-proxy/app/server.go
@@ -280,6 +280,7 @@ func (o *Options) writeConfigFile() error {
 	if err != nil {
 		return err
 	}
+	// TODO handle error
 	defer configFile.Close()
 
 	if err := encoder.Encode(o.config, configFile); err != nil {
@@ -342,11 +343,11 @@ func (o *Options) loadConfig(data []byte) (*kubeproxyconfig.KubeProxyConfigurati
 	if err != nil {
 		return nil, err
 	}
-	config, ok := configObj.(*kubeproxyconfig.KubeProxyConfiguration)
+	proxyConfig, ok := configObj.(*kubeproxyconfig.KubeProxyConfiguration)
 	if !ok {
 		return nil, fmt.Errorf("got unexpected config type: %v", gvk)
 	}
-	return config, nil
+	return proxyConfig, nil
 }
 
 func (o *Options) ApplyDefaults(in *kubeproxyconfig.KubeProxyConfiguration) (*kubeproxyconfig.KubeProxyConfiguration, error) {
@@ -406,6 +407,7 @@ with the apiserver API to configure the proxy.`,
 
 	opts.AddFlags(cmd.Flags())
 
+	// TODO handle error
 	cmd.MarkFlagFilename("config", "yaml", "yml", "json")
 
 	return cmd
@@ -462,8 +464,6 @@ func createClients(config componentbaseconfig.ClientConnectionConfiguration, mas
 	kubeConfig.AcceptContentTypes = config.AcceptContentTypes
 	kubeConfig.ContentType = config.ContentType
 	kubeConfig.QPS = config.QPS
-	//TODO make config struct use int instead of int32?
-	// https://github.com/kubernetes/kubernetes/issues/73375
 	kubeConfig.Burst = int(config.Burst)
 
 	client, err := clientset.NewForConfig(kubeConfig)
@@ -523,18 +523,18 @@ func (s *ProxyServer) Run() error {
 
 	// Start up a metrics server if requested
 	if len(s.MetricsBindAddress) > 0 {
-		mux := mux.NewPathRecorderMux("kube-proxy")
-		healthz.InstallHandler(mux)
-		mux.HandleFunc("/proxyMode", func(w http.ResponseWriter, r *http.Request) {
+		proxyMux := mux.NewPathRecorderMux("kube-proxy")
+		healthz.InstallHandler(proxyMux)
+		proxyMux.HandleFunc("/proxyMode", func(w http.ResponseWriter, r *http.Request) {
 			fmt.Fprintf(w, "%s", s.ProxyMode)
 		})
-		mux.Handle("/metrics", prometheus.Handler())
+		proxyMux.Handle("/metrics", prometheus.Handler())
 		if s.EnableProfiling {
-			routes.Profiling{}.Install(mux)
+			routes.Profiling{}.Install(proxyMux)
 		}
-		configz.InstallHandler(mux)
+		configz.InstallHandler(proxyMux)
 		go wait.Until(func() {
-			err := http.ListenAndServe(s.MetricsBindAddress, mux)
+			err := http.ListenAndServe(s.MetricsBindAddress, proxyMux)
 			if err != nil {
 				utilruntime.HandleError(fmt.Errorf("starting metrics server failed: %v", err))
 			}