From d4b41afe59736e63c0f5388256324c2583d7a659 Mon Sep 17 00:00:00 2001
From: guangxuli
Date: Thu, 17 Aug 2017 22:59:45 +0800
Subject: [PATCH] fix incorrect logic
---
.../src/k8s.io/apiserver/pkg/admission/plugins.go | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/staging/src/k8s.io/apiserver/pkg/admission/plugins.go b/staging/src/k8s.io/apiserver/pkg/admission/plugins.go
index dd1368d4ddd..5ddfc7e1f84 100644
--- a/staging/src/k8s.io/apiserver/pkg/admission/plugins.go
+++ b/staging/src/k8s.io/apiserver/pkg/admission/plugins.go
@@ -67,13 +67,15 @@ func (ps *Plugins) Registered() []string {
func (ps *Plugins) Register(name string, plugin Factory) {
ps.lock.Lock()
defer ps.lock.Unlock()
- _, found := ps.registry[name]
- if found {
- glog.Fatalf("Admission plugin %q was registered twice", name)
- }
- if ps.registry == nil {
+ if ps.registry != nil {
+ _, found := ps.registry[name]
+ if found {
+ glog.Fatalf("Admission plugin %q was registered twice", name)
+ }
+ } else {
ps.registry = map[string]Factory{}
}
+
glog.V(1).Infof("Registered admission plugin %q", name)
ps.registry[name] = plugin
}