register experimental apis as apis/experimental/..

mark --api-version as deprecated
2015-09-14 15:30:32 -07:00
parent e7666814e2
commit 9bef5ff99d
10 changed files with 29 additions and 24 deletions
--- a/test/integration/framework/master_utils.go
+++ b/test/integration/framework/master_utils.go
@@ -147,7 +147,7 @@ func startMasterOrDie(masterConfig *master.Config) (*master.Master, *httptest.Se
 			EnableProfiling:    true,
 			EnableUISupport:    false,
 			APIPrefix:          "/api",
-			ExpAPIPrefix:       "/experimental",
+			APIGroupPrefix:     "/apis",
 			Authorizer:         apiserver.NewAlwaysAllowAuthorizer(),
 			AdmissionControl:   admit.NewAlwaysAdmit(),
 		}
@@ -285,7 +285,7 @@ func RunAMaster(t *testing.T) (*master.Master, *httptest.Server) {
 		EnableProfiling:    true,
 		EnableUISupport:    false,
 		APIPrefix:          "/api",
-		ExpAPIPrefix:       "/experimental",
+		APIGroupPrefix:     "/apis",
 		EnableExp:          true,
 		Authorizer:         apiserver.NewAlwaysAllowAuthorizer(),
 		AdmissionControl:   admit.NewAlwaysAdmit(),