github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 09:49:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #90312 from tangcong/fix-kubeadm-staticcheck-err

Browse Source 
fix kubeadm staticcheck err
This commit is contained in:
Kubernetes Prow Robot 2020-04-20 19:48:56 -07:00 committed by GitHub
commit 7709cf9eae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/kubeadm/app/preflight/checks.go
View File

@ -803,6 +803,7 @@ func getEtcdVersionResponse(client *http.Client, url string, target interface{})
loopCount-- loopCount--
return false, err return false, err
} }
//lint:ignore SA5011 If err != nil we are already returning.
defer r.Body.Close() defer r.Body.Close()
if r != nil && r.StatusCode >= 500 && r.StatusCode <= 599 { if r != nil && r.StatusCode >= 500 && r.StatusCode <= 599 {

1
cmd/kubeadm/app/util/config/cluster_test.go
View File

@ -748,6 +748,7 @@ func TestGetInitConfigurationFromCluster(t *testing.T) {
// Test expected values in InitConfiguration // Test expected values in InitConfiguration
if cfg == nil { if cfg == nil {
t.Errorf("unexpected nil return value") t.Errorf("unexpected nil return value")
return
} }
if cfg.ClusterConfiguration.KubernetesVersion != k8sVersionString { if cfg.ClusterConfiguration.KubernetesVersion != k8sVersionString {
t.Errorf("invalid ClusterConfiguration.KubernetesVersion") t.Errorf("invalid ClusterConfiguration.KubernetesVersion")