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

k8s-ci-robot · web-flow · commit 7709cf9eae3f · 2020-04-20T19:48:56.000-07:00
fix kubeadm staticcheck err
diff --git a/cmd/kubeadm/app/preflight/checks.go b/cmd/kubeadm/app/preflight/checks.go
@@ -803,6 +803,7 @@ func getEtcdVersionResponse(client *http.Client, url string, target interface{})
 				loopCount--
 				return false, err
 			}
+			//lint:ignore SA5011 If err != nil we are already returning.
 			defer r.Body.Close()
 
 			if r != nil && r.StatusCode >= 500 && r.StatusCode <= 599 {
diff --git a/cmd/kubeadm/app/util/config/cluster_test.go b/cmd/kubeadm/app/util/config/cluster_test.go
@@ -748,6 +748,7 @@ func TestGetInitConfigurationFromCluster(t *testing.T) {
 			// Test expected values in InitConfiguration
 			if cfg == nil {
 				t.Errorf("unexpected nil return value")
+				return
 			}
 			if cfg.ClusterConfiguration.KubernetesVersion != k8sVersionString {
 				t.Errorf("invalid ClusterConfiguration.KubernetesVersion")

Original file line number	Diff line number	Diff line change
`@@ -803,6 +803,7 @@ func getEtcdVersionResponse(client *http.Client, url string, target interface{})`
`803`	`803`	`loopCount--`
`804`	`804`	`return false, err`
`805`	`805`	`}`
	`806`	`+ //lint:ignore SA5011 If err != nil we are already returning.`
`806`	`807`	`defer r.Body.Close()`
`807`	`808`
`808`	`809`	`if r != nil && r.StatusCode >= 500 && r.StatusCode <= 599 {`
Original file line number	Diff line number	Diff line change
`@@ -748,6 +748,7 @@ func TestGetInitConfigurationFromCluster(t *testing.T) {`
`748`	`748`	`// Test expected values in InitConfiguration`
`749`	`749`	`if cfg == nil {`
`750`	`750`	`t.Errorf("unexpected nil return value")`
	`751`	`+ return`
`751`	`752`	`}`
`752`	`753`	`if cfg.ClusterConfiguration.KubernetesVersion != k8sVersionString {`
`753`	`754`	`t.Errorf("invalid ClusterConfiguration.KubernetesVersion")`