github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 10:51:29 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #87403 from gavinfish/kubectl_pkg

Browse Source 
Staticcheck: vendor/k8s.io/kubectl/pkg/scale etc.
This commit is contained in:
Kubernetes Prow Robot 2020-02-12 07:48:52 -08:00 committed by GitHub
commit de9bbcc9cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 8 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hack/.staticcheck_failures
View File

@ -103,9 +103,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

2
staging/src/k8s.io/kubectl/pkg/cmd/top/top_node.go
View File

@ -181,7 +181,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 {

2
staging/src/k8s.io/kubectl/pkg/cmd/top/top_pod.go
View File

@ -175,7 +175,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 {

1
staging/src/k8s.io/kubectl/pkg/cmd/util/editor/BUILD
View File

@ -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",

7
staging/src/k8s.io/kubectl/pkg/cmd/util/editor/editoptions.go
View File

@ -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 {

4
staging/src/k8s.io/kubectl/pkg/cmd/wait/wait.go
View File

@ -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

6
staging/src/k8s.io/kubectl/pkg/describe/versioned/describe_test.go
View File

@ -3661,12 +3661,6 @@ Events: <none>` + "\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(

8
staging/src/k8s.io/kubectl/pkg/scale/scale_test.go
View File

@ -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")
}