Merge pull request #84674 from hwdef/fix-staticcheck4

pkg/client: fix staticcheck warning
This commit is contained in:
Kubernetes Prow Robot 2019-11-14 13:30:45 -08:00 committed by GitHub
commit 5c772f5933
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 7 deletions

View File

@ -3,7 +3,6 @@ cluster/images/etcd/migrate
cmd/kube-controller-manager/app
cmd/kube-proxy/app
cmd/linkcheck
pkg/client/tests
pkg/controller/daemon
pkg/controller/deployment
pkg/controller/disruption

View File

@ -48,13 +48,12 @@ func parseSelectorOrDie(s string) fields.Selector {
// buildQueryValues is a convenience function for knowing if a namespace should be in a query param or not
func buildQueryValues(query url.Values) url.Values {
v := url.Values{}
if query != nil {
for key, values := range query {
for _, value := range values {
v.Add(key, value)
}
for key, values := range query {
for _, value := range values {
v.Add(key, value)
}
}
return v
}

View File

@ -173,7 +173,7 @@ func TestForwardPorts(t *testing.T) {
continue
}
b := make([]byte, 4)
n, err = clientConn.Read(b)
_, err = clientConn.Read(b)
if err != nil && err != io.EOF {
t.Errorf("%s: Error reading data: %s", testName, err)
server.Close()