remove legacy API prefix from generic

2016-10-10 14:52:39 -04:00
parent 3a882072e9
commit 6406aacb59
9 changed files with 165 additions and 139 deletions
--- a/test/integration/framework/master_utils.go
+++ b/test/integration/framework/master_utils.go
@@ -61,6 +61,7 @@ import (
 	"k8s.io/kubernetes/pkg/runtime"
 	"k8s.io/kubernetes/pkg/storage/storagebackend"
 	utilnet "k8s.io/kubernetes/pkg/util/net"
+	"k8s.io/kubernetes/pkg/util/sets"
 	"k8s.io/kubernetes/pkg/util/wait"
 	"k8s.io/kubernetes/pkg/watch"
 	"k8s.io/kubernetes/plugin/pkg/admission/admit"
@@ -346,7 +347,7 @@ func NewMasterConfig() *master.Config {
 	return &master.Config{
 		GenericConfig: &genericapiserver.Config{
 			APIResourceConfigSource: master.DefaultAPIResourceConfigSource(),
-			APIPrefix:               "/api",
+			LegacyAPIGroupPrefixes:  sets.NewString("/api"),
 			APIGroupPrefix:          "/apis",
 			Authorizer:              authorizer.NewAlwaysAllowAuthorizer(),
 			AdmissionControl:        admit.NewAlwaysAdmit(),