Skip to content

Commit 0d1ac16

Browse files
authored
Merge pull request kubernetes#95180 from SaiHarshaK/staticcheck_kubectl_get
fix staticcheck for kubectl pkg files
2 parents 24cfb41 + f6b3c5f commit 0d1ac16

File tree

4 files changed

+3
-8
lines changed

4 files changed

+3
-8
lines changed

hack/.staticcheck_failures

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,5 @@ vendor/k8s.io/client-go/rest/watch
5858
vendor/k8s.io/client-go/restmapper
5959
vendor/k8s.io/client-go/tools/leaderelection
6060
vendor/k8s.io/client-go/transport
61-
vendor/k8s.io/kubectl/pkg/cmd/get
6261
vendor/k8s.io/kubectl/pkg/cmd/scale
63-
vendor/k8s.io/kubectl/pkg/cmd/testing
6462
vendor/k8s.io/metrics/pkg/client/custom_metrics

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,8 @@ func (s *CustomColumnsPrinter) PrintObj(obj runtime.Object, out io.Writer) error
162162
return fmt.Errorf(printers.InternalObjectPrinterErr)
163163
}
164164

165-
if w, found := out.(*tabwriter.Writer); !found {
166-
w = printers.GetNewTabWriter(out)
165+
if _, found := out.(*tabwriter.Writer); !found {
166+
w := printers.GetNewTabWriter(out)
167167
out = w
168168
defer w.Flush()
169169
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ import (
5555
)
5656

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

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ package testing
1818

1919
import (
2020
"bytes"
21-
"errors"
2221
"fmt"
2322
"io/ioutil"
2423
"os"
@@ -271,8 +270,6 @@ func convertExternalNamespacedType2ToInternalNamespacedType(in *ExternalNamespac
271270
return nil
272271
}
273272

274-
var errInvalidVersion = errors.New("not a version")
275-
276273
// ValidVersion of API
277274
var ValidVersion = "v1"
278275

0 commit comments

Comments
 (0)