From 048053d4cf81ba004d3fbe97b3b1824a0ed0e1b4 Mon Sep 17 00:00:00 2001 From: Ethan Chu Date: Sat, 27 May 2017 17:36:59 +0800 Subject: [PATCH 1/2] Fix golint errors in cmd/kube-apiserver --- cmd/kube-apiserver/app/preflight/checks.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/cmd/kube-apiserver/app/preflight/checks.go b/cmd/kube-apiserver/app/preflight/checks.go index 1e55eca2430..c3bbd057790 100644 --- a/cmd/kube-apiserver/app/preflight/checks.go +++ b/cmd/kube-apiserver/app/preflight/checks.go @@ -31,6 +31,7 @@ type connection interface { CheckEtcdServers() (bool, error) } +// EtcdConnection holds the Etcd server list type EtcdConnection struct { ServerList []string } @@ -44,19 +45,19 @@ func (EtcdConnection) serverReachable(address string) bool { } func parseServerURI(serverURI string) (string, error) { - connUrl, err := url.Parse(serverURI) + connURL, err := url.Parse(serverURI) if err != nil { return "", fmt.Errorf("unable to parse etcd url: %v", err) } - return connUrl.Host, nil + return connURL.Host, nil } // CheckEtcdServers will attempt to reach all etcd servers once. If any // can be reached, return true. func (con EtcdConnection) CheckEtcdServers() (done bool, err error) { // Attempt to reach every Etcd server in order - for _, serverUri := range con.ServerList { - host, err := parseServerURI(serverUri) + for _, serverURI := range con.ServerList { + host, err := parseServerURI(serverURI) if err != nil { return false, err } From ec18533f8117b2b464c505e56e0e8d8f0277913c Mon Sep 17 00:00:00 2001 From: Ethan Chu Date: Mon, 29 May 2017 20:57:11 +0800 Subject: [PATCH 2/2] Add cmd/kube-apiserver/app/preflight to linted packages list --- hack/.linted_packages | 1 + 1 file changed, 1 insertion(+) diff --git a/hack/.linted_packages b/hack/.linted_packages index 24c0e0ebda1..3281492dba2 100644 --- a/hack/.linted_packages +++ b/hack/.linted_packages @@ -13,6 +13,7 @@ cmd/gke-certificates-controller cmd/kube-apiserver cmd/kube-apiserver/app cmd/kube-apiserver/app/options +cmd/kube-apiserver/app/preflight cmd/kube-controller-manager cmd/kube-controller-manager/app/options cmd/kube-proxy