Merge pull request #95180 from SaiHarshaK/staticcheck_kubectl_get

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
4 changed files with 3 additions and 8 deletions

View File

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

View File

@@ -55,7 +55,6 @@ import (
)
var (
openapiSchemaPath = filepath.Join("..", "..", "..", "testdata", "openapi", "swagger.json")
grace = int64(30)
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.
func TestGetUnknownSchemaObject(t *testing.T) {
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")
defer tf.Cleanup()
_, _, codec := cmdtesting.NewExternalScheme()

View File

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