github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-19 08:40:42 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #95180 from SaiHarshaK/staticcheck_kubectl_get

Browse Source 
fix staticcheck for kubectl pkg files
This commit is contained in:
Kubernetes Prow Robot 2020-10-03 10:47:05 -07:00 committed by GitHub
commit 0d1ac16ca4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hack/.staticcheck_failures
View File

@ -58,7 +58,5 @@ vendor/k8s.io/client-go/rest/watch
vendor/k8s.io/client-go/restmapper vendor/k8s.io/client-go/restmapper
vendor/k8s.io/client-go/tools/leaderelection vendor/k8s.io/client-go/tools/leaderelection
vendor/k8s.io/client-go/transport vendor/k8s.io/client-go/transport
vendor/k8s.io/kubectl/pkg/cmd/get
vendor/k8s.io/kubectl/pkg/cmd/scale vendor/k8s.io/kubectl/pkg/cmd/scale
vendor/k8s.io/kubectl/pkg/cmd/testing
vendor/k8s.io/metrics/pkg/client/custom_metrics vendor/k8s.io/metrics/pkg/client/custom_metrics

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

@ -162,8 +162,8 @@ func (s *CustomColumnsPrinter) PrintObj(obj runtime.Object, out io.Writer) error
return fmt.Errorf(printers.InternalObjectPrinterErr) return fmt.Errorf(printers.InternalObjectPrinterErr)
} }
if w, found := out.(*tabwriter.Writer); !found { if _, found := out.(*tabwriter.Writer); !found {
w = printers.GetNewTabWriter(out) w := printers.GetNewTabWriter(out)
out = w out = w
defer w.Flush() defer w.Flush()
} }

2
staging/src/k8s.io/kubectl/pkg/cmd/get/get_test.go
View File

@ -55,7 +55,6 @@ import (
) )
var ( var (
openapiSchemaPath = filepath.Join("..", "..", "..", "testdata", "openapi", "swagger.json")
grace = int64(30) grace = int64(30)
enableServiceLinks = corev1.DefaultEnableServiceLinks enableServiceLinks = corev1.DefaultEnableServiceLinks
) )
@ -90,6 +89,7 @@ func testComponentStatusData() *corev1.ComponentStatusList {
// Verifies that schemas that are not in the master tree of Kubernetes can be retrieved via Get. // Verifies that schemas that are not in the master tree of Kubernetes can be retrieved via Get.
func TestGetUnknownSchemaObject(t *testing.T) { func TestGetUnknownSchemaObject(t *testing.T) {
t.Skip("This test is completely broken. The first thing it does is add the object to the scheme!") t.Skip("This test is completely broken. The first thing it does is add the object to the scheme!")
var openapiSchemaPath = filepath.Join("..", "..", "..", "testdata", "openapi", "swagger.json")
tf := cmdtesting.NewTestFactory().WithNamespace("test") tf := cmdtesting.NewTestFactory().WithNamespace("test")
defer tf.Cleanup() defer tf.Cleanup()
_, _, codec := cmdtesting.NewExternalScheme() _, _, codec := cmdtesting.NewExternalScheme()

3
staging/src/k8s.io/kubectl/pkg/cmd/testing/fake.go
View File

@ -18,7 +18,6 @@ package testing
import ( import (
"bytes" "bytes"
"errors"
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"os" "os"
@ -271,8 +270,6 @@ func convertExternalNamespacedType2ToInternalNamespacedType(in *ExternalNamespac
return nil return nil
} }
var errInvalidVersion = errors.New("not a version")
// ValidVersion of API // ValidVersion of API
var ValidVersion = "v1" var ValidVersion = "v1"