Adding events to federation apiserver

cmd/hyperkube/federation-apiserver.go

@@ -18,13 +18,13 @@ package main
 
 import (
 	"k8s.io/kubernetes/federation/cmd/federation-apiserver/app"
-	genericoptions "k8s.io/kubernetes/pkg/genericapiserver/options"
+	"k8s.io/kubernetes/federation/cmd/federation-apiserver/app/options"
 )
 
 // NewFederationAPIServer creates a new hyperkube Server object that includes the
 // description and flags.
 func NewFederationAPIServer() *Server {
-	s := genericoptions.NewServerRunOptions().WithEtcdOptions()
+	s := options.NewServerRunOptions()
 
 	hks := Server{
 		SimpleUsage: "federation-apiserver",
@@ -33,7 +33,6 @@ func NewFederationAPIServer() *Server {
 			return app.Run(s)
 		},
 	}
-	s.AddUniversalFlags(hks.Flags())
-	s.AddEtcdStorageFlags(hks.Flags())
+	s.AddFlags(hks.Flags())
 	return &hks
 }