github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #46566 from xychu/kube-apiserver

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 46561, 46566)

Fix golint errors in cmd/kube-apiserver

**What this PR does / why we need it**:

**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #

**Special notes for your reviewer**:

**Release note**:

```release-note
```
This commit is contained in:
Kubernetes Submit Queue
2017-05-30 02:50:57 -07:00
committed by GitHub
parent c866355894 ec18533f81
commit a4e730336d
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/kube-apiserver/app/preflight/checks.go
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
} }

1
hack/.linted_packages
View File

@@ -13,6 +13,7 @@ cmd/gke-certificates-controller
cmd/kube-apiserver cmd/kube-apiserver
cmd/kube-apiserver/app cmd/kube-apiserver/app
cmd/kube-apiserver/app/options cmd/kube-apiserver/app/options
cmd/kube-apiserver/app/preflight
cmd/kube-controller-manager cmd/kube-controller-manager
cmd/kube-controller-manager/app/options cmd/kube-controller-manager/app/options
cmd/kube-proxy cmd/kube-proxy