Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
9d1e6d3e
Commit
9d1e6d3e
authored
Nov 08, 2017
by
hzxuzhonghu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove redundant code in admission initializer
parent
adf78356
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
9 additions
and
30 deletions
+9
-30
gc_admission_test.go
plugin/pkg/admission/gc/gc_admission_test.go
+1
-4
initializer.go
...k8s.io/apiserver/pkg/admission/initializer/initializer.go
+2
-2
initializer_test.go
...o/apiserver/pkg/admission/initializer/initializer_test.go
+4
-16
admission_test.go
...kg/admission/plugin/namespace/lifecycle/admission_test.go
+1
-4
admission.go
staging/src/k8s.io/apiserver/pkg/server/options/admission.go
+1
-4
No files found.
plugin/pkg/admission/gc/gc_admission_test.go
View file @
9d1e6d3e
...
@@ -86,10 +86,7 @@ func newGCPermissionsEnforcement() (*gcPermissionsEnforcement, error) {
...
@@ -86,10 +86,7 @@ func newGCPermissionsEnforcement() (*gcPermissionsEnforcement, error) {
whiteList
:
whiteList
,
whiteList
:
whiteList
,
}
}
genericPluginInitializer
,
err
:=
initializer
.
New
(
nil
,
nil
,
fakeAuthorizer
{},
nil
)
genericPluginInitializer
:=
initializer
.
New
(
nil
,
nil
,
fakeAuthorizer
{},
nil
)
if
err
!=
nil
{
return
nil
,
err
}
pluginInitializer
:=
kubeadmission
.
NewPluginInitializer
(
nil
,
nil
,
nil
,
legacyscheme
.
Registry
.
RESTMapper
(),
nil
,
nil
,
nil
)
pluginInitializer
:=
kubeadmission
.
NewPluginInitializer
(
nil
,
nil
,
nil
,
legacyscheme
.
Registry
.
RESTMapper
(),
nil
,
nil
,
nil
)
initializersChain
:=
admission
.
PluginInitializers
{}
initializersChain
:=
admission
.
PluginInitializers
{}
initializersChain
=
append
(
initializersChain
,
genericPluginInitializer
)
initializersChain
=
append
(
initializersChain
,
genericPluginInitializer
)
...
...
staging/src/k8s.io/apiserver/pkg/admission/initializer/initializer.go
View file @
9d1e6d3e
...
@@ -38,13 +38,13 @@ func New(
...
@@ -38,13 +38,13 @@ func New(
extInformers
informers
.
SharedInformerFactory
,
extInformers
informers
.
SharedInformerFactory
,
authz
authorizer
.
Authorizer
,
authz
authorizer
.
Authorizer
,
scheme
*
runtime
.
Scheme
,
scheme
*
runtime
.
Scheme
,
)
(
pluginInitializer
,
error
)
{
)
pluginInitializer
{
return
pluginInitializer
{
return
pluginInitializer
{
externalClient
:
extClientset
,
externalClient
:
extClientset
,
externalInformers
:
extInformers
,
externalInformers
:
extInformers
,
authorizer
:
authz
,
authorizer
:
authz
,
scheme
:
scheme
,
scheme
:
scheme
,
}
,
nil
}
}
}
// Initialize checks the initialization interfaces implemented by a plugin
// Initialize checks the initialization interfaces implemented by a plugin
...
...
staging/src/k8s.io/apiserver/pkg/admission/initializer/initializer_test.go
View file @
9d1e6d3e
...
@@ -33,10 +33,7 @@ import (
...
@@ -33,10 +33,7 @@ import (
// the WantsScheme interface is implemented by a plugin.
// the WantsScheme interface is implemented by a plugin.
func
TestWantsScheme
(
t
*
testing
.
T
)
{
func
TestWantsScheme
(
t
*
testing
.
T
)
{
scheme
:=
runtime
.
NewScheme
()
scheme
:=
runtime
.
NewScheme
()
target
,
err
:=
initializer
.
New
(
nil
,
nil
,
nil
,
scheme
)
target
:=
initializer
.
New
(
nil
,
nil
,
nil
,
scheme
)
if
err
!=
nil
{
t
.
Fatal
(
err
)
}
wantSchemeAdmission
:=
&
WantSchemeAdmission
{}
wantSchemeAdmission
:=
&
WantSchemeAdmission
{}
target
.
Initialize
(
wantSchemeAdmission
)
target
.
Initialize
(
wantSchemeAdmission
)
if
wantSchemeAdmission
.
scheme
!=
scheme
{
if
wantSchemeAdmission
.
scheme
!=
scheme
{
...
@@ -47,10 +44,7 @@ func TestWantsScheme(t *testing.T) {
...
@@ -47,10 +44,7 @@ func TestWantsScheme(t *testing.T) {
// TestWantsAuthorizer ensures that the authorizer is injected
// TestWantsAuthorizer ensures that the authorizer is injected
// when the WantsAuthorizer interface is implemented by a plugin.
// when the WantsAuthorizer interface is implemented by a plugin.
func
TestWantsAuthorizer
(
t
*
testing
.
T
)
{
func
TestWantsAuthorizer
(
t
*
testing
.
T
)
{
target
,
err
:=
initializer
.
New
(
nil
,
nil
,
&
TestAuthorizer
{},
nil
)
target
:=
initializer
.
New
(
nil
,
nil
,
&
TestAuthorizer
{},
nil
)
if
err
!=
nil
{
t
.
Fatal
(
err
)
}
wantAuthorizerAdmission
:=
&
WantAuthorizerAdmission
{}
wantAuthorizerAdmission
:=
&
WantAuthorizerAdmission
{}
target
.
Initialize
(
wantAuthorizerAdmission
)
target
.
Initialize
(
wantAuthorizerAdmission
)
if
wantAuthorizerAdmission
.
auth
==
nil
{
if
wantAuthorizerAdmission
.
auth
==
nil
{
...
@@ -62,10 +56,7 @@ func TestWantsAuthorizer(t *testing.T) {
...
@@ -62,10 +56,7 @@ func TestWantsAuthorizer(t *testing.T) {
// when the WantsExternalKubeClientSet interface is implemented by a plugin.
// when the WantsExternalKubeClientSet interface is implemented by a plugin.
func
TestWantsExternalKubeClientSet
(
t
*
testing
.
T
)
{
func
TestWantsExternalKubeClientSet
(
t
*
testing
.
T
)
{
cs
:=
&
fake
.
Clientset
{}
cs
:=
&
fake
.
Clientset
{}
target
,
err
:=
initializer
.
New
(
cs
,
nil
,
&
TestAuthorizer
{},
nil
)
target
:=
initializer
.
New
(
cs
,
nil
,
&
TestAuthorizer
{},
nil
)
if
err
!=
nil
{
t
.
Fatal
(
err
)
}
wantExternalKubeClientSet
:=
&
WantExternalKubeClientSet
{}
wantExternalKubeClientSet
:=
&
WantExternalKubeClientSet
{}
target
.
Initialize
(
wantExternalKubeClientSet
)
target
.
Initialize
(
wantExternalKubeClientSet
)
if
wantExternalKubeClientSet
.
cs
!=
cs
{
if
wantExternalKubeClientSet
.
cs
!=
cs
{
...
@@ -78,10 +69,7 @@ func TestWantsExternalKubeClientSet(t *testing.T) {
...
@@ -78,10 +69,7 @@ func TestWantsExternalKubeClientSet(t *testing.T) {
func
TestWantsExternalKubeInformerFactory
(
t
*
testing
.
T
)
{
func
TestWantsExternalKubeInformerFactory
(
t
*
testing
.
T
)
{
cs
:=
&
fake
.
Clientset
{}
cs
:=
&
fake
.
Clientset
{}
sf
:=
informers
.
NewSharedInformerFactory
(
cs
,
time
.
Duration
(
1
)
*
time
.
Second
)
sf
:=
informers
.
NewSharedInformerFactory
(
cs
,
time
.
Duration
(
1
)
*
time
.
Second
)
target
,
err
:=
initializer
.
New
(
cs
,
sf
,
&
TestAuthorizer
{},
nil
)
target
:=
initializer
.
New
(
cs
,
sf
,
&
TestAuthorizer
{},
nil
)
if
err
!=
nil
{
t
.
Fatal
(
err
)
}
wantExternalKubeInformerFactory
:=
&
WantExternalKubeInformerFactory
{}
wantExternalKubeInformerFactory
:=
&
WantExternalKubeInformerFactory
{}
target
.
Initialize
(
wantExternalKubeInformerFactory
)
target
.
Initialize
(
wantExternalKubeInformerFactory
)
if
wantExternalKubeInformerFactory
.
sf
!=
sf
{
if
wantExternalKubeInformerFactory
.
sf
!=
sf
{
...
...
staging/src/k8s.io/apiserver/pkg/admission/plugin/namespace/lifecycle/admission_test.go
View file @
9d1e6d3e
...
@@ -48,10 +48,7 @@ func newHandlerForTestWithClock(c clientset.Interface, cacheClock clock.Clock) (
...
@@ -48,10 +48,7 @@ func newHandlerForTestWithClock(c clientset.Interface, cacheClock clock.Clock) (
if
err
!=
nil
{
if
err
!=
nil
{
return
nil
,
f
,
err
return
nil
,
f
,
err
}
}
pluginInitializer
,
err
:=
kubeadmission
.
New
(
c
,
f
,
nil
,
nil
)
pluginInitializer
:=
kubeadmission
.
New
(
c
,
f
,
nil
,
nil
)
if
err
!=
nil
{
return
handler
,
f
,
err
}
pluginInitializer
.
Initialize
(
handler
)
pluginInitializer
.
Initialize
(
handler
)
err
=
admission
.
ValidateInitialization
(
handler
)
err
=
admission
.
ValidateInitialization
(
handler
)
return
handler
,
f
,
err
return
handler
,
f
,
err
...
...
staging/src/k8s.io/apiserver/pkg/server/options/admission.go
View file @
9d1e6d3e
...
@@ -99,10 +99,7 @@ func (a *AdmissionOptions) ApplyTo(
...
@@ -99,10 +99,7 @@ func (a *AdmissionOptions) ApplyTo(
if
err
!=
nil
{
if
err
!=
nil
{
return
err
return
err
}
}
genericInitializer
,
err
:=
initializer
.
New
(
clientset
,
informers
,
c
.
Authorizer
,
scheme
)
genericInitializer
:=
initializer
.
New
(
clientset
,
informers
,
c
.
Authorizer
,
scheme
)
if
err
!=
nil
{
return
err
}
initializersChain
:=
admission
.
PluginInitializers
{}
initializersChain
:=
admission
.
PluginInitializers
{}
pluginInitializers
=
append
(
pluginInitializers
,
genericInitializer
)
pluginInitializers
=
append
(
pluginInitializers
,
genericInitializer
)
initializersChain
=
append
(
initializersChain
,
pluginInitializers
...
)
initializersChain
=
append
(
initializersChain
,
pluginInitializers
...
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment