From aea323d020c9a919ba84f2576d76fe5ca791da7b Mon Sep 17 00:00:00 2001 From: Chao Xu Date: Mon, 31 Jul 2017 18:07:46 -0700 Subject: [PATCH] Let controllers ignore initialization timeout error when creating a pod. Kubernetes-commit: 97e07e5b52d310ac24d1d46572a4435e694a48f8 --- pkg/registry/generic/registry/store.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkg/registry/generic/registry/store.go b/pkg/registry/generic/registry/store.go index be51729f5..ef1bd068f 100644 --- a/pkg/registry/generic/registry/store.go +++ b/pkg/registry/generic/registry/store.go @@ -362,8 +362,9 @@ func (e *Store) WaitForInitialized(ctx genericapirequest.Context, obj runtime.Ob select { case event, ok := <-ch: if !ok { - // TODO: should we just expose the partially initialized object? - return nil, kubeerr.NewServerTimeout(e.QualifiedResource, "create", 0) + msg := fmt.Sprintf("server has timed out waiting for the initialization of %s %s", + e.QualifiedResource.String(), accessor.GetName()) + return nil, kubeerr.NewTimeoutError(msg, 0) } switch event.Type { case watch.Deleted: