From a5800ab4cbbe39b949d75e21cec03a04c9a2ed27 Mon Sep 17 00:00:00 2001 From: Jesus Herrera Date: Thu, 21 May 2020 23:06:56 -0400 Subject: [PATCH] Fix linter and bazel errors --- plugin/pkg/admission/runtimeclass/BUILD | 6 ++++++ plugin/pkg/admission/runtimeclass/admission.go | 1 + plugin/pkg/admission/runtimeclass/admission_test.go | 12 +++++------- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/plugin/pkg/admission/runtimeclass/BUILD b/plugin/pkg/admission/runtimeclass/BUILD index f049e46bf20..e8932e2f18d 100644 --- a/plugin/pkg/admission/runtimeclass/BUILD +++ b/plugin/pkg/admission/runtimeclass/BUILD @@ -31,6 +31,8 @@ go_test( embed = [":go_default_library"], deps = [ "//pkg/apis/core:go_default_library", + "//pkg/controller:go_default_library", + "//pkg/features:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/api/node/v1beta1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/resource:go_default_library", @@ -38,6 +40,10 @@ go_test( "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", "//staging/src/k8s.io/apiserver/pkg/admission:go_default_library", "//staging/src/k8s.io/apiserver/pkg/authentication/user:go_default_library", + "//staging/src/k8s.io/client-go/informers:go_default_library", + "//staging/src/k8s.io/client-go/kubernetes:go_default_library", + "//staging/src/k8s.io/client-go/kubernetes/fake:go_default_library", + "//staging/src/k8s.io/component-base/featuregate:go_default_library", "//vendor/github.com/stretchr/testify/assert:go_default_library", ], ) diff --git a/plugin/pkg/admission/runtimeclass/admission.go b/plugin/pkg/admission/runtimeclass/admission.go index f88742ad59a..5b087082509 100644 --- a/plugin/pkg/admission/runtimeclass/admission.go +++ b/plugin/pkg/admission/runtimeclass/admission.go @@ -74,6 +74,7 @@ var _ admission.ValidationInterface = &RuntimeClass{} var _ genericadmissioninitailizer.WantsExternalKubeInformerFactory = &RuntimeClass{} var _ genericadmissioninitailizer.WantsExternalKubeClientSet = &RuntimeClass{} +// SetExternalKubeClientSet sets the client for the plugin func (r *RuntimeClass) SetExternalKubeClientSet(client kubernetes.Interface) { r.runtimeClassClient = client.NodeV1beta1().RuntimeClasses() } diff --git a/plugin/pkg/admission/runtimeclass/admission_test.go b/plugin/pkg/admission/runtimeclass/admission_test.go index 6e299fcb156..70d7085f013 100644 --- a/plugin/pkg/admission/runtimeclass/admission_test.go +++ b/plugin/pkg/admission/runtimeclass/admission_test.go @@ -1,4 +1,3 @@ - /* Copyright 2019 The Kubernetes Authors. @@ -30,12 +29,12 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apiserver/pkg/admission" "k8s.io/apiserver/pkg/authentication/user" - "k8s.io/kubernetes/pkg/apis/core" - "k8s.io/client-go/kubernetes/fake" - api "k8s.io/kubernetes/pkg/apis/core" "k8s.io/client-go/informers" "k8s.io/client-go/kubernetes" + "k8s.io/client-go/kubernetes/fake" "k8s.io/component-base/featuregate" + "k8s.io/kubernetes/pkg/apis/core" + api "k8s.io/kubernetes/pkg/apis/core" "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/features" @@ -352,7 +351,7 @@ func newRuntimeClassForTest(runtimeClassEnabled bool, if addClient { var client kubernetes.Interface if clientObject != nil { - client = fake.NewSimpleClientset(clientObject) + client = fake.NewSimpleClientset(clientObject) } else { client = fake.NewSimpleClientset() } @@ -386,7 +385,7 @@ func TestValidateInitialization(t *testing.T) { { name: "runtimeClass enabled, no lister", expectError: true, - runtimeClass: newRuntimeClassForTest(true, true, false, nil, true, nil,), + runtimeClass: newRuntimeClassForTest(true, true, false, nil, true, nil), }, { name: "runtimeClass enabled, no client", @@ -433,7 +432,6 @@ func TestAdmit(t *testing.T) { false, nil) - tests := []struct { name string expectError bool