Fix golint errors in cmd/kube-apiserver

This commit is contained in:
Ethan Chu 2017-05-27 17:36:59 +08:00
parent b58c7ec456
commit 048053d4cf

View File

@ -31,6 +31,7 @@ type connection interface {
CheckEtcdServers() (bool, error) CheckEtcdServers() (bool, error)
} }
// EtcdConnection holds the Etcd server list
type EtcdConnection struct { type EtcdConnection struct {
ServerList []string ServerList []string
} }
@ -44,19 +45,19 @@ func (EtcdConnection) serverReachable(address string) bool {
} }
func parseServerURI(serverURI string) (string, error) { func parseServerURI(serverURI string) (string, error) {
connUrl, err := url.Parse(serverURI) connURL, err := url.Parse(serverURI)
if err != nil { if err != nil {
return "", fmt.Errorf("unable to parse etcd url: %v", err) 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 // CheckEtcdServers will attempt to reach all etcd servers once. If any
// can be reached, return true. // can be reached, return true.
func (con EtcdConnection) CheckEtcdServers() (done bool, err error) { func (con EtcdConnection) CheckEtcdServers() (done bool, err error) {
// Attempt to reach every Etcd server in order // Attempt to reach every Etcd server in order
for _, serverUri := range con.ServerList { for _, serverURI := range con.ServerList {
host, err := parseServerURI(serverUri) host, err := parseServerURI(serverURI)
if err != nil { if err != nil {
return false, err return false, err
} }