From c28be0baab44bab188dd2eaf60e5e65e3c60b943 Mon Sep 17 00:00:00 2001 From: chymy Date: Fri, 26 Feb 2021 03:17:40 -0500 Subject: [PATCH] Fix staticcheck failures for pkg/controller/replicaset and pkg/kubelet/dockershim --- hack/.staticcheck_failures | 2 -- pkg/controller/replicaset/replica_set_test.go | 9 +-------- pkg/kubelet/dockershim/docker_container.go | 1 + 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/hack/.staticcheck_failures b/hack/.staticcheck_failures index a8563d0361d..e8fca0e484a 100644 --- a/hack/.staticcheck_failures +++ b/hack/.staticcheck_failures @@ -1,6 +1,4 @@ cluster/images/etcd/migrate -pkg/controller/replicaset -pkg/kubelet/dockershim vendor/k8s.io/apimachinery/pkg/api/apitesting/roundtrip vendor/k8s.io/apimachinery/pkg/apis/meta/v1/validation vendor/k8s.io/apimachinery/pkg/runtime/serializer/json diff --git a/pkg/controller/replicaset/replica_set_test.go b/pkg/controller/replicaset/replica_set_test.go index a7faf14f365..3c09d2816cc 100644 --- a/pkg/controller/replicaset/replica_set_test.go +++ b/pkg/controller/replicaset/replica_set_test.go @@ -504,13 +504,6 @@ func TestPodControllerLookup(t *testing.T) { } } -// byName sorts pods by their names. -type byName []*v1.Pod - -func (pods byName) Len() int { return len(pods) } -func (pods byName) Swap(i, j int) { pods[i], pods[j] = pods[j], pods[i] } -func (pods byName) Less(i, j int) bool { return pods[i].Name < pods[j].Name } - func TestRelatedPodsLookup(t *testing.T) { someRS := newReplicaSet(1, map[string]string{"foo": "bar"}) someRS.Name = "foo1" @@ -1222,7 +1215,7 @@ func TestExpectationsOnRecreate(t *testing.T) { t.Fatalf("Deleting RS didn't result in new item in the queue: %v", err) } - rsExp, exists, err = manager.expectations.GetExpectations(oldRSKey) + _, exists, err = manager.expectations.GetExpectations(oldRSKey) if err != nil { t.Fatal(err) } diff --git a/pkg/kubelet/dockershim/docker_container.go b/pkg/kubelet/dockershim/docker_container.go index 55d8b90908c..2171e60bee4 100644 --- a/pkg/kubelet/dockershim/docker_container.go +++ b/pkg/kubelet/dockershim/docker_container.go @@ -180,6 +180,7 @@ func (ds *dockerService) CreateContainer(_ context.Context, r *runtimeapi.Create } hc.Resources.Devices = devices + //lint:ignore SA1019 backwards compatibility securityOpts, err := ds.getSecurityOpts(config.GetLinux().GetSecurityContext().GetSeccompProfilePath(), securityOptSeparator) if err != nil { return nil, fmt.Errorf("failed to generate security options for container %q: %v", config.Metadata.Name, err)