From c37db061dae0fc020f9761242cf075180d9b5f9d Mon Sep 17 00:00:00 2001
From: hzxuzhonghu <xuzhonghu@huawei.com>
Date: Wed, 8 Nov 2017 10:54:06 +0800
Subject: [PATCH] remove redundant code in admission initializer

Kubernetes-commit: 9d1e6d3e2cc25db8e07db446d00390059c8264f8
---
 pkg/admission/initializer/initializer.go      |  4 ++--
 pkg/admission/initializer/initializer_test.go | 20 ++++---------------
 .../namespace/lifecycle/admission_test.go     |  5 +----
 pkg/server/options/admission.go               |  5 +----
 4 files changed, 8 insertions(+), 26 deletions(-)

diff --git a/pkg/admission/initializer/initializer.go b/pkg/admission/initializer/initializer.go
index 9ee990a3a..abe764bb9 100644
--- a/pkg/admission/initializer/initializer.go
+++ b/pkg/admission/initializer/initializer.go
@@ -38,13 +38,13 @@ func New(
 	extInformers informers.SharedInformerFactory,
 	authz authorizer.Authorizer,
 	scheme *runtime.Scheme,
-) (pluginInitializer, error) {
+) pluginInitializer {
 	return pluginInitializer{
 		externalClient:    extClientset,
 		externalInformers: extInformers,
 		authorizer:        authz,
 		scheme:            scheme,
-	}, nil
+	}
 }
 
 // Initialize checks the initialization interfaces implemented by a plugin
diff --git a/pkg/admission/initializer/initializer_test.go b/pkg/admission/initializer/initializer_test.go
index 43153b91c..c2d6ea234 100644
--- a/pkg/admission/initializer/initializer_test.go
+++ b/pkg/admission/initializer/initializer_test.go
@@ -33,10 +33,7 @@ import (
 // the WantsScheme interface is implemented by a plugin.
 func TestWantsScheme(t *testing.T) {
 	scheme := runtime.NewScheme()
-	target, err := initializer.New(nil, nil, nil, scheme)
-	if err != nil {
-		t.Fatal(err)
-	}
+	target := initializer.New(nil, nil, nil, scheme)
 	wantSchemeAdmission := &WantSchemeAdmission{}
 	target.Initialize(wantSchemeAdmission)
 	if wantSchemeAdmission.scheme != scheme {
@@ -47,10 +44,7 @@ func TestWantsScheme(t *testing.T) {
 // TestWantsAuthorizer ensures that the authorizer is injected
 // when the WantsAuthorizer interface is implemented by a plugin.
 func TestWantsAuthorizer(t *testing.T) {
-	target, err := initializer.New(nil, nil, &TestAuthorizer{}, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
+	target := initializer.New(nil, nil, &TestAuthorizer{}, nil)
 	wantAuthorizerAdmission := &WantAuthorizerAdmission{}
 	target.Initialize(wantAuthorizerAdmission)
 	if wantAuthorizerAdmission.auth == nil {
@@ -62,10 +56,7 @@ func TestWantsAuthorizer(t *testing.T) {
 // when the WantsExternalKubeClientSet interface is implemented by a plugin.
 func TestWantsExternalKubeClientSet(t *testing.T) {
 	cs := &fake.Clientset{}
-	target, err := initializer.New(cs, nil, &TestAuthorizer{}, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
+	target := initializer.New(cs, nil, &TestAuthorizer{}, nil)
 	wantExternalKubeClientSet := &WantExternalKubeClientSet{}
 	target.Initialize(wantExternalKubeClientSet)
 	if wantExternalKubeClientSet.cs != cs {
@@ -78,10 +69,7 @@ func TestWantsExternalKubeClientSet(t *testing.T) {
 func TestWantsExternalKubeInformerFactory(t *testing.T) {
 	cs := &fake.Clientset{}
 	sf := informers.NewSharedInformerFactory(cs, time.Duration(1)*time.Second)
-	target, err := initializer.New(cs, sf, &TestAuthorizer{}, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
+	target := initializer.New(cs, sf, &TestAuthorizer{}, nil)
 	wantExternalKubeInformerFactory := &WantExternalKubeInformerFactory{}
 	target.Initialize(wantExternalKubeInformerFactory)
 	if wantExternalKubeInformerFactory.sf != sf {
diff --git a/pkg/admission/plugin/namespace/lifecycle/admission_test.go b/pkg/admission/plugin/namespace/lifecycle/admission_test.go
index 3c2c74e4d..3eca3b67f 100644
--- a/pkg/admission/plugin/namespace/lifecycle/admission_test.go
+++ b/pkg/admission/plugin/namespace/lifecycle/admission_test.go
@@ -48,10 +48,7 @@ func newHandlerForTestWithClock(c clientset.Interface, cacheClock clock.Clock) (
 	if err != nil {
 		return nil, f, err
 	}
-	pluginInitializer, err := kubeadmission.New(c, f, nil, nil)
-	if err != nil {
-		return handler, f, err
-	}
+	pluginInitializer := kubeadmission.New(c, f, nil, nil)
 	pluginInitializer.Initialize(handler)
 	err = admission.ValidateInitialization(handler)
 	return handler, f, err
diff --git a/pkg/server/options/admission.go b/pkg/server/options/admission.go
index 601a26d23..b769d855f 100644
--- a/pkg/server/options/admission.go
+++ b/pkg/server/options/admission.go
@@ -99,10 +99,7 @@ func (a *AdmissionOptions) ApplyTo(
 	if err != nil {
 		return err
 	}
-	genericInitializer, err := initializer.New(clientset, informers, c.Authorizer, scheme)
-	if err != nil {
-		return err
-	}
+	genericInitializer := initializer.New(clientset, informers, c.Authorizer, scheme)
 	initializersChain := admission.PluginInitializers{}
 	pluginInitializers = append(pluginInitializers, genericInitializer)
 	initializersChain = append(initializersChain, pluginInitializers...)