From f4940cf55fd7c2787b370464d491a764c4febd78 Mon Sep 17 00:00:00 2001 From: gavinfish Date: Tue, 21 Jan 2020 10:13:10 +0800 Subject: [PATCH 1/2] Staticcheck: vendor/k8s.io/kubectl/pkg/scale|describe/versioned|cmd/top|cmd/util/editor|cmd/top --- hack/.staticcheck_failures | 5 ----- staging/src/k8s.io/kubectl/pkg/cmd/top/top_node.go | 2 +- staging/src/k8s.io/kubectl/pkg/cmd/top/top_pod.go | 2 +- .../src/k8s.io/kubectl/pkg/cmd/util/editor/editoptions.go | 7 ------- staging/src/k8s.io/kubectl/pkg/cmd/wait/wait.go | 4 ++-- .../kubectl/pkg/describe/versioned/describe_test.go | 6 ------ staging/src/k8s.io/kubectl/pkg/scale/scale_test.go | 8 ++++---- 7 files changed, 8 insertions(+), 26 deletions(-) diff --git a/hack/.staticcheck_failures b/hack/.staticcheck_failures index 4120867685f..6a747134878 100644 --- a/hack/.staticcheck_failures +++ b/hack/.staticcheck_failures @@ -104,9 +104,4 @@ vendor/k8s.io/kubectl/pkg/cmd/rollingupdate vendor/k8s.io/kubectl/pkg/cmd/scale vendor/k8s.io/kubectl/pkg/cmd/set vendor/k8s.io/kubectl/pkg/cmd/testing -vendor/k8s.io/kubectl/pkg/cmd/top -vendor/k8s.io/kubectl/pkg/cmd/util/editor -vendor/k8s.io/kubectl/pkg/cmd/wait -vendor/k8s.io/kubectl/pkg/describe/versioned -vendor/k8s.io/kubectl/pkg/scale vendor/k8s.io/metrics/pkg/client/custom_metrics diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/top/top_node.go b/staging/src/k8s.io/kubectl/pkg/cmd/top/top_node.go index b13ea75130d..09049c07eec 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/top/top_node.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/top/top_node.go @@ -180,7 +180,7 @@ func (o TopNodeOptions) RunTopNode() error { metricsAPIAvailable := SupportedMetricsAPIVersionAvailable(apiGroups) - metrics := &metricsapi.NodeMetricsList{} + var metrics *metricsapi.NodeMetricsList if metricsAPIAvailable { metrics, err = getNodeMetricsFromMetricsAPI(o.MetricsClient, o.ResourceName, selector) if err != nil { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/top/top_pod.go b/staging/src/k8s.io/kubectl/pkg/cmd/top/top_pod.go index 04ab569fb78..c2cb40cca2c 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/top/top_pod.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/top/top_pod.go @@ -174,7 +174,7 @@ func (o TopPodOptions) RunTopPod() error { metricsAPIAvailable := SupportedMetricsAPIVersionAvailable(apiGroups) - metrics := &metricsapi.PodMetricsList{} + var metrics *metricsapi.PodMetricsList if metricsAPIAvailable { metrics, err = getMetricsFromMetricsAPI(o.MetricsClient, o.Namespace, o.ResourceName, o.AllNamespaces, selector) if err != nil { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/util/editor/editoptions.go b/staging/src/k8s.io/kubectl/pkg/cmd/util/editor/editoptions.go index 6e0412ec3f9..bc063aab644 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/util/editor/editoptions.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/util/editor/editoptions.go @@ -37,7 +37,6 @@ import ( "k8s.io/apimachinery/pkg/api/meta" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" - "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/mergepatch" "k8s.io/apimachinery/pkg/util/strategicpatch" @@ -731,10 +730,6 @@ func (h *editHeader) writeTo(w io.Writer, editMode EditMode) error { return nil } -func (h *editHeader) flush() { - h.reasons = []editReason{} -} - // editResults capture the result of an update type editResults struct { header editHeader @@ -742,8 +737,6 @@ type editResults struct { notfound int edit []*resource.Info file string - - version schema.GroupVersion } func (r *editResults) addError(err error, info *resource.Info) string { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/wait/wait.go b/staging/src/k8s.io/kubectl/pkg/cmd/wait/wait.go index 6cef7907abe..3a084015583 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/wait/wait.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/wait/wait.go @@ -426,14 +426,14 @@ func (w ConditionalWait) checkCondition(obj *unstructured.Unstructured) (bool, e for _, conditionUncast := range conditions { condition := conditionUncast.(map[string]interface{}) name, found, err := unstructured.NestedString(condition, "type") - if !found || err != nil || strings.ToLower(name) != strings.ToLower(w.conditionName) { + if !found || err != nil || !strings.EqualFold(name, w.conditionName) { continue } status, found, err := unstructured.NestedString(condition, "status") if !found || err != nil { continue } - return strings.ToLower(status) == strings.ToLower(w.conditionStatus), nil + return strings.EqualFold(status, w.conditionStatus), nil } return false, nil diff --git a/staging/src/k8s.io/kubectl/pkg/describe/versioned/describe_test.go b/staging/src/k8s.io/kubectl/pkg/describe/versioned/describe_test.go index 7c5573bf4ca..a01ea686bac 100644 --- a/staging/src/k8s.io/kubectl/pkg/describe/versioned/describe_test.go +++ b/staging/src/k8s.io/kubectl/pkg/describe/versioned/describe_test.go @@ -3661,12 +3661,6 @@ Events: ` + "\n" } } -// boolPtr returns a pointer to a bool -func boolPtr(b bool) *bool { - o := b - return &o -} - func TestControllerRef(t *testing.T) { var replicas int32 = 1 f := fake.NewSimpleClientset( diff --git a/staging/src/k8s.io/kubectl/pkg/scale/scale_test.go b/staging/src/k8s.io/kubectl/pkg/scale/scale_test.go index 4a9d9f22bca..4ea5761e040 100644 --- a/staging/src/k8s.io/kubectl/pkg/scale/scale_test.go +++ b/staging/src/k8s.io/kubectl/pkg/scale/scale_test.go @@ -78,7 +78,7 @@ func TestReplicationControllerScaleRetry(t *testing.T) { } preconditions := ScalePrecondition{3, ""} scaleFunc = ScaleCondition(scaler, &preconditions, namespace, name, count, nil, rcgvr) - pass, err = scaleFunc() + _, err = scaleFunc() if err == nil { t.Errorf("Expected error on precondition failure") } @@ -188,7 +188,7 @@ func TestDeploymentScaleRetry(t *testing.T) { } preconditions := &ScalePrecondition{3, ""} scaleFunc = ScaleCondition(scaler, preconditions, namespace, name, count, nil, deploygvr) - pass, err = scaleFunc() + _, err = scaleFunc() if err == nil { t.Error("Expected error on precondition failure") } @@ -318,7 +318,7 @@ func TestStatefulSetScaleRetry(t *testing.T) { } preconditions := &ScalePrecondition{3, ""} scaleFunc = ScaleCondition(scaler, preconditions, namespace, name, count, nil, stsgvr) - pass, err = scaleFunc() + _, err = scaleFunc() if err == nil { t.Error("Expected error on precondition failure") } @@ -427,7 +427,7 @@ func TestReplicaSetScaleRetry(t *testing.T) { } preconditions := &ScalePrecondition{3, ""} scaleFunc = ScaleCondition(scaler, preconditions, namespace, name, count, nil, rsgvr) - pass, err = scaleFunc() + _, err = scaleFunc() if err == nil { t.Error("Expected error on precondition failure") } From 527de3b51520ee317fb6a4fa869a76f881720fe7 Mon Sep 17 00:00:00 2001 From: drfish Date: Tue, 21 Jan 2020 13:51:51 +0800 Subject: [PATCH 2/2] Update with update-bazel.sh script --- staging/src/k8s.io/kubectl/pkg/cmd/util/editor/BUILD | 1 - 1 file changed, 1 deletion(-) diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/util/editor/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/util/editor/BUILD index 2578f14ce40..2ed85451fd1 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/util/editor/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/util/editor/BUILD @@ -15,7 +15,6 @@ go_library( "//staging/src/k8s.io/apimachinery/pkg/api/meta:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/unstructured:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/types:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/mergepatch:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/strategicpatch:go_default_library",