From b3377e61de95bf66aa2f9c4ee3b2c06955774012 Mon Sep 17 00:00:00 2001
From: hwdef <hwdef97@gmail.com>
Date: Tue, 12 Nov 2019 09:44:05 +0800
Subject: [PATCH] pkg/kubeapiserver: fix staticcheck warning

---
 hack/.staticcheck_failures                  |  1 -
 pkg/kubeapiserver/admission/BUILD           |  1 -
 pkg/kubeapiserver/admission/initializer.go  | 11 +++--------
 pkg/kubeapiserver/options/authentication.go |  2 +-
 4 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/hack/.staticcheck_failures b/hack/.staticcheck_failures
index 754de9bb8b7..818e5b88c2e 100644
--- a/hack/.staticcheck_failures
+++ b/hack/.staticcheck_failures
@@ -15,7 +15,6 @@ pkg/controller/podgc
 pkg/controller/replicaset
 pkg/controller/resourcequota
 pkg/controller/statefulset
-pkg/kubeapiserver/admission
 pkg/kubelet/apis/podresources
 pkg/kubelet/cm/devicemanager
 pkg/kubelet/pluginmanager/operationexecutor
diff --git a/pkg/kubeapiserver/admission/BUILD b/pkg/kubeapiserver/admission/BUILD
index 6f788d9483b..60584cab146 100644
--- a/pkg/kubeapiserver/admission/BUILD
+++ b/pkg/kubeapiserver/admission/BUILD
@@ -15,7 +15,6 @@ go_library(
         "//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library",
         "//staging/src/k8s.io/apiserver/pkg/admission:go_default_library",
         "//staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/initializer:go_default_library",
-        "//staging/src/k8s.io/apiserver/pkg/authorization/authorizer:go_default_library",
         "//staging/src/k8s.io/apiserver/pkg/server:go_default_library",
         "//staging/src/k8s.io/apiserver/pkg/util/webhook:go_default_library",
         "//staging/src/k8s.io/client-go/discovery/cached/memory:go_default_library",
diff --git a/pkg/kubeapiserver/admission/initializer.go b/pkg/kubeapiserver/admission/initializer.go
index 731631e824d..35734322e0e 100644
--- a/pkg/kubeapiserver/admission/initializer.go
+++ b/pkg/kubeapiserver/admission/initializer.go
@@ -19,8 +19,6 @@ package admission
 import (
 	"k8s.io/apimachinery/pkg/api/meta"
 	"k8s.io/apiserver/pkg/admission"
-	"k8s.io/apiserver/pkg/authorization/authorizer"
-	"k8s.io/apiserver/pkg/util/webhook"
 	quota "k8s.io/kubernetes/pkg/quota/v1"
 )
 
@@ -44,12 +42,9 @@ type WantsQuotaConfiguration interface {
 
 // PluginInitializer is used for initialization of the Kubernetes specific admission plugins.
 type PluginInitializer struct {
-	authorizer                        authorizer.Authorizer
-	cloudConfig                       []byte
-	restMapper                        meta.RESTMapper
-	quotaConfiguration                quota.Configuration
-	serviceResolver                   webhook.ServiceResolver
-	authenticationInfoResolverWrapper webhook.AuthenticationInfoResolverWrapper
+	cloudConfig        []byte
+	restMapper         meta.RESTMapper
+	quotaConfiguration quota.Configuration
 }
 
 var _ admission.PluginInitializer = &PluginInitializer{}
diff --git a/pkg/kubeapiserver/options/authentication.go b/pkg/kubeapiserver/options/authentication.go
index 1d528d97376..5a99757d0b0 100644
--- a/pkg/kubeapiserver/options/authentication.go
+++ b/pkg/kubeapiserver/options/authentication.go
@@ -177,7 +177,7 @@ func (s *BuiltInAuthenticationOptions) Validate() []error {
 	}
 	if s.ServiceAccounts != nil && utilfeature.DefaultFeatureGate.Enabled(features.BoundServiceAccountTokenVolume) {
 		if !utilfeature.DefaultFeatureGate.Enabled(features.TokenRequest) || !utilfeature.DefaultFeatureGate.Enabled(features.TokenRequestProjection) {
-			allErrors = append(allErrors, errors.New("If the BoundServiceAccountTokenVolume feature is enabled,"+
+			allErrors = append(allErrors, errors.New("if the BoundServiceAccountTokenVolume feature is enabled,"+
 				" the TokenRequest and TokenRequestProjection features must also be enabled"))
 		}
 		if len(s.ServiceAccounts.Issuer) == 0 {