diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 8a266e288..028d5f958 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -840,235 +840,235 @@
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/api/equality",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "c64b638dee05ac8335a0c7e28c9e7cc17d0df6a5"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/api/errors",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "c64b638dee05ac8335a0c7e28c9e7cc17d0df6a5"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/api/meta",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "c64b638dee05ac8335a0c7e28c9e7cc17d0df6a5"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/api/resource",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "c64b638dee05ac8335a0c7e28c9e7cc17d0df6a5"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/api/testing",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "c64b638dee05ac8335a0c7e28c9e7cc17d0df6a5"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/api/testing/fuzzer",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "c64b638dee05ac8335a0c7e28c9e7cc17d0df6a5"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/api/testing/roundtrip",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "c64b638dee05ac8335a0c7e28c9e7cc17d0df6a5"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/api/validation",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "c64b638dee05ac8335a0c7e28c9e7cc17d0df6a5"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/api/validation/path",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "c64b638dee05ac8335a0c7e28c9e7cc17d0df6a5"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/apimachinery",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "c64b638dee05ac8335a0c7e28c9e7cc17d0df6a5"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/apimachinery/announced",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "c64b638dee05ac8335a0c7e28c9e7cc17d0df6a5"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/apimachinery/registered",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "c64b638dee05ac8335a0c7e28c9e7cc17d0df6a5"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "c64b638dee05ac8335a0c7e28c9e7cc17d0df6a5"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "c64b638dee05ac8335a0c7e28c9e7cc17d0df6a5"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "c64b638dee05ac8335a0c7e28c9e7cc17d0df6a5"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "c64b638dee05ac8335a0c7e28c9e7cc17d0df6a5"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/validation",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "c64b638dee05ac8335a0c7e28c9e7cc17d0df6a5"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1alpha1",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "c64b638dee05ac8335a0c7e28c9e7cc17d0df6a5"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/conversion",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "c64b638dee05ac8335a0c7e28c9e7cc17d0df6a5"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "c64b638dee05ac8335a0c7e28c9e7cc17d0df6a5"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/conversion/unstructured",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "c64b638dee05ac8335a0c7e28c9e7cc17d0df6a5"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/fields",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "c64b638dee05ac8335a0c7e28c9e7cc17d0df6a5"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/labels",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "c64b638dee05ac8335a0c7e28c9e7cc17d0df6a5"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/runtime",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "c64b638dee05ac8335a0c7e28c9e7cc17d0df6a5"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "c64b638dee05ac8335a0c7e28c9e7cc17d0df6a5"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "c64b638dee05ac8335a0c7e28c9e7cc17d0df6a5"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "c64b638dee05ac8335a0c7e28c9e7cc17d0df6a5"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "c64b638dee05ac8335a0c7e28c9e7cc17d0df6a5"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "c64b638dee05ac8335a0c7e28c9e7cc17d0df6a5"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "c64b638dee05ac8335a0c7e28c9e7cc17d0df6a5"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "c64b638dee05ac8335a0c7e28c9e7cc17d0df6a5"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/selection",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "c64b638dee05ac8335a0c7e28c9e7cc17d0df6a5"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/types",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "c64b638dee05ac8335a0c7e28c9e7cc17d0df6a5"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/cache",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "c64b638dee05ac8335a0c7e28c9e7cc17d0df6a5"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/clock",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "c64b638dee05ac8335a0c7e28c9e7cc17d0df6a5"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/diff",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "c64b638dee05ac8335a0c7e28c9e7cc17d0df6a5"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/errors",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "c64b638dee05ac8335a0c7e28c9e7cc17d0df6a5"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/framer",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "c64b638dee05ac8335a0c7e28c9e7cc17d0df6a5"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/httpstream",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "c64b638dee05ac8335a0c7e28c9e7cc17d0df6a5"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "c64b638dee05ac8335a0c7e28c9e7cc17d0df6a5"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/json",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "c64b638dee05ac8335a0c7e28c9e7cc17d0df6a5"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "c64b638dee05ac8335a0c7e28c9e7cc17d0df6a5"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/net",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "c64b638dee05ac8335a0c7e28c9e7cc17d0df6a5"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/proxy",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "c64b638dee05ac8335a0c7e28c9e7cc17d0df6a5"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/rand",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "c64b638dee05ac8335a0c7e28c9e7cc17d0df6a5"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "c64b638dee05ac8335a0c7e28c9e7cc17d0df6a5"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/sets",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "c64b638dee05ac8335a0c7e28c9e7cc17d0df6a5"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "c64b638dee05ac8335a0c7e28c9e7cc17d0df6a5"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/uuid",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "c64b638dee05ac8335a0c7e28c9e7cc17d0df6a5"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/validation",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "c64b638dee05ac8335a0c7e28c9e7cc17d0df6a5"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "c64b638dee05ac8335a0c7e28c9e7cc17d0df6a5"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/wait",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "c64b638dee05ac8335a0c7e28c9e7cc17d0df6a5"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/yaml",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "c64b638dee05ac8335a0c7e28c9e7cc17d0df6a5"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/version",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "c64b638dee05ac8335a0c7e28c9e7cc17d0df6a5"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/watch",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "c64b638dee05ac8335a0c7e28c9e7cc17d0df6a5"
     },
     {
       "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "c64b638dee05ac8335a0c7e28c9e7cc17d0df6a5"
     },
     {
       "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "c64b638dee05ac8335a0c7e28c9e7cc17d0df6a5"
     },
     {
       "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "c64b638dee05ac8335a0c7e28c9e7cc17d0df6a5"
     },
     {
       "ImportPath": "k8s.io/client-go/discovery",
diff --git a/pkg/server/hooks.go b/pkg/server/hooks.go
index 5fbae16ae..a190f5622 100644
--- a/pkg/server/hooks.go
+++ b/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()