From 15c54ffa7750c3037f464933c2b678a9a94cea82 Mon Sep 17 00:00:00 2001 From: Simo Sorce Date: Wed, 23 Aug 2017 11:06:29 -0400 Subject: [PATCH] Add an OrDie version for AddPostStartHook Simplifies usage and consolidate the error message so it is always the same everywhere. Signed-off-by: Simo Sorce --- pkg/master/master.go | 12 +++--------- staging/src/k8s.io/apiserver/pkg/server/hooks.go | 7 +++++++ 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/pkg/master/master.go b/pkg/master/master.go index 97c5c5357bf..d6f7130a076 100644 --- a/pkg/master/master.go +++ b/pkg/master/master.go @@ -278,9 +278,7 @@ func (c completedConfig) New(delegationTarget genericapiserver.DelegationTarget) m.installTunneler(c.Tunneler, corev1client.NewForConfigOrDie(c.GenericConfig.LoopbackClientConfig).Nodes()) } - if err := m.GenericAPIServer.AddPostStartHook("ca-registration", c.ClientCARegistrationHook.PostStartHook); err != nil { - glog.Fatalf("Error registering PostStartHook %q: %v", "ca-registration", err) - } + m.GenericAPIServer.AddPostStartHookOrDie("ca-registration", c.ClientCARegistrationHook.PostStartHook) return m, nil } @@ -294,9 +292,7 @@ func (m *Master) InstallLegacyAPI(c *Config, restOptionsGetter generic.RESTOptio if c.EnableCoreControllers { coreClient := coreclient.NewForConfigOrDie(c.GenericConfig.LoopbackClientConfig) bootstrapController := c.NewBootstrapController(legacyRESTStorage, coreClient, coreClient) - if err := m.GenericAPIServer.AddPostStartHook("bootstrap-controller", bootstrapController.PostStartHook); err != nil { - glog.Fatalf("Error registering PostStartHook %q: %v", "bootstrap-controller", err) - } + m.GenericAPIServer.AddPostStartHookOrDie("bootstrap-controller", bootstrapController.PostStartHook) } if err := m.GenericAPIServer.InstallLegacyAPIGroup(genericapiserver.DefaultLegacyAPIPrefix, &apiGroupInfo); err != nil { @@ -341,9 +337,7 @@ func (m *Master) InstallAPIs(apiResourceConfigSource serverstorage.APIResourceCo if err != nil { glog.Fatalf("Error building PostStartHook: %v", err) } - if err := m.GenericAPIServer.AddPostStartHook(name, hook); err != nil { - glog.Fatalf("Error registering PostStartHook %q: %v", name, err) - } + m.GenericAPIServer.AddPostStartHookOrDie(name, hook) } apiGroupsInfo = append(apiGroupsInfo, apiGroupInfo) diff --git a/staging/src/k8s.io/apiserver/pkg/server/hooks.go b/staging/src/k8s.io/apiserver/pkg/server/hooks.go index 5fbae16ae7d..a190f562202 100644 --- a/staging/src/k8s.io/apiserver/pkg/server/hooks.go +++ b/staging/src/k8s.io/apiserver/pkg/server/hooks.go @@ -90,6 +90,13 @@ func (s *GenericAPIServer) AddPostStartHook(name string, hook PostStartHookFunc) return nil } +// AddPostStartHookOrDie allows you to add a PostStartHook, but dies on failure +func (s *GenericAPIServer) AddPostStartHookOrDie(name string, hook PostStartHookFunc) { + if err := s.AddPostStartHook(name, hook); err != nil { + glog.Fatalf("Error registering PostStartHook %q: %v", name, err) + } +} + // RunPostStartHooks runs the PostStartHooks for the server func (s *GenericAPIServer) RunPostStartHooks(stopCh <-chan struct{}) { s.postStartHookLock.Lock()