Stop exposing v1beta3 by default

2015-06-29 19:30:14 -07:00
parent 1cf9a71aa2
commit c465a50891
10 changed files with 73 additions and 45 deletions
--- a/test/integration/auth_test.go
+++ b/test/integration/auth_test.go
@@ -393,8 +393,10 @@ func TestAuthModeAlwaysAllow(t *testing.T) {
 		EnableUISupport:       false,
 		EnableIndex:           true,
 		APIPrefix:             "/api",
-		Authorizer:            apiserver.NewAlwaysAllowAuthorizer(),
-		AdmissionControl:      admit.NewAlwaysAdmit(),
+		// enable v1beta3 if we are testing that api version.
+		EnableV1Beta3:    testapi.Version() == "v1beta3",
+		Authorizer:       apiserver.NewAlwaysAllowAuthorizer(),
+		AdmissionControl: admit.NewAlwaysAdmit(),
 	})

 	transport := http.DefaultTransport
@@ -509,8 +511,10 @@ func TestAuthModeAlwaysDeny(t *testing.T) {
 		EnableUISupport:       false,
 		EnableIndex:           true,
 		APIPrefix:             "/api",
-		Authorizer:            apiserver.NewAlwaysDenyAuthorizer(),
-		AdmissionControl:      admit.NewAlwaysAdmit(),
+		// enable v1beta3 if we are testing that api version.
+		EnableV1Beta3:    testapi.Version() == "v1beta3",
+		Authorizer:       apiserver.NewAlwaysDenyAuthorizer(),
+		AdmissionControl: admit.NewAlwaysAdmit(),
 	})

 	transport := http.DefaultTransport
@@ -576,9 +580,11 @@ func TestAliceNotForbiddenOrUnauthorized(t *testing.T) {
 		EnableUISupport:       false,
 		EnableIndex:           true,
 		APIPrefix:             "/api",
-		Authenticator:         getTestTokenAuth(),
-		Authorizer:            allowAliceAuthorizer{},
-		AdmissionControl:      admit.NewAlwaysAdmit(),
+		// enable v1beta3 if we are testing that api version.
+		EnableV1Beta3:    testapi.Version() == "v1beta3",
+		Authenticator:    getTestTokenAuth(),
+		Authorizer:       allowAliceAuthorizer{},
+		AdmissionControl: admit.NewAlwaysAdmit(),
 	})

 	previousResourceVersion := make(map[string]float64)
@@ -663,9 +669,11 @@ func TestBobIsForbidden(t *testing.T) {
 		EnableUISupport:       false,
 		EnableIndex:           true,
 		APIPrefix:             "/api",
-		Authenticator:         getTestTokenAuth(),
-		Authorizer:            allowAliceAuthorizer{},
-		AdmissionControl:      admit.NewAlwaysAdmit(),
+		// enable v1beta3 if we are testing that api version.
+		EnableV1Beta3:    testapi.Version() == "v1beta3",
+		Authenticator:    getTestTokenAuth(),
+		Authorizer:       allowAliceAuthorizer{},
+		AdmissionControl: admit.NewAlwaysAdmit(),
 	})

 	transport := http.DefaultTransport
@@ -724,9 +732,11 @@ func TestUnknownUserIsUnauthorized(t *testing.T) {
 		EnableUISupport:       false,
 		EnableIndex:           true,
 		APIPrefix:             "/api",
-		Authenticator:         getTestTokenAuth(),
-		Authorizer:            allowAliceAuthorizer{},
-		AdmissionControl:      admit.NewAlwaysAdmit(),
+		// enable v1beta3 if we are testing that api version.
+		EnableV1Beta3:    testapi.Version() == "v1beta3",
+		Authenticator:    getTestTokenAuth(),
+		Authorizer:       allowAliceAuthorizer{},
+		AdmissionControl: admit.NewAlwaysAdmit(),
 	})

 	transport := http.DefaultTransport
@@ -804,9 +814,11 @@ func TestNamespaceAuthorization(t *testing.T) {
 		EnableUISupport:       false,
 		EnableIndex:           true,
 		APIPrefix:             "/api",
-		Authenticator:         getTestTokenAuth(),
-		Authorizer:            a,
-		AdmissionControl:      admit.NewAlwaysAdmit(),
+		// enable v1beta3 if we are testing that api version.
+		EnableV1Beta3:    testapi.Version() == "v1beta3",
+		Authenticator:    getTestTokenAuth(),
+		Authorizer:       a,
+		AdmissionControl: admit.NewAlwaysAdmit(),
 	})

 	previousResourceVersion := make(map[string]float64)
@@ -919,9 +931,11 @@ func TestKindAuthorization(t *testing.T) {
 		EnableUISupport:       false,
 		EnableIndex:           true,
 		APIPrefix:             "/api",
-		Authenticator:         getTestTokenAuth(),
-		Authorizer:            a,
-		AdmissionControl:      admit.NewAlwaysAdmit(),
+		// enable v1beta3 if we are testing that api version.
+		EnableV1Beta3:    testapi.Version() == "v1beta3",
+		Authenticator:    getTestTokenAuth(),
+		Authorizer:       a,
+		AdmissionControl: admit.NewAlwaysAdmit(),
 	})

 	previousResourceVersion := make(map[string]float64)
@@ -1021,9 +1035,11 @@ func TestReadOnlyAuthorization(t *testing.T) {
 		EnableUISupport:       false,
 		EnableIndex:           true,
 		APIPrefix:             "/api",
-		Authenticator:         getTestTokenAuth(),
-		Authorizer:            a,
-		AdmissionControl:      admit.NewAlwaysAdmit(),
+		// enable v1beta3 if we are testing that api version.
+		EnableV1Beta3:    testapi.Version() == "v1beta3",
+		Authenticator:    getTestTokenAuth(),
+		Authorizer:       a,
+		AdmissionControl: admit.NewAlwaysAdmit(),
 	})

 	transport := http.DefaultTransport
--- a/test/integration/framework/master_utils.go
+++ b/test/integration/framework/master_utils.go
@@ -139,8 +139,10 @@ func startMasterOrDie(masterConfig *master.Config) (*master.Master, *httptest.Se
 			EnableProfiling:   true,
 			EnableUISupport:   false,
 			APIPrefix:         "/api",
-			Authorizer:        apiserver.NewAlwaysAllowAuthorizer(),
-			AdmissionControl:  admit.NewAlwaysAdmit(),
+			// Enable v1bewta3 if we are testing that version
+			EnableV1Beta3:    testapi.Version() == "v1beta3",
+			Authorizer:       apiserver.NewAlwaysAllowAuthorizer(),
+			AdmissionControl: admit.NewAlwaysAdmit(),
 		}
 	} else {
 		helper = masterConfig.EtcdHelper
@@ -270,8 +272,10 @@ func RunAMaster(t *testing.T) (*master.Master, *httptest.Server) {
 		EnableProfiling:   true,
 		EnableUISupport:   false,
 		APIPrefix:         "/api",
-		Authorizer:        apiserver.NewAlwaysAllowAuthorizer(),
-		AdmissionControl:  admit.NewAlwaysAdmit(),
+		// Enable v1bewta3 if we are testing that version
+		EnableV1Beta3:    testapi.Version() == "v1beta3",
+		Authorizer:       apiserver.NewAlwaysAllowAuthorizer(),
+		AdmissionControl: admit.NewAlwaysAdmit(),
 	})

 	s := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
--- a/test/integration/scheduler_test.go
+++ b/test/integration/scheduler_test.go
@@ -73,8 +73,10 @@ func TestUnschedulableNodes(t *testing.T) {
 		EnableUISupport:       false,
 		EnableIndex:           true,
 		APIPrefix:             "/api",
-		Authorizer:            apiserver.NewAlwaysAllowAuthorizer(),
-		AdmissionControl:      admit.NewAlwaysAdmit(),
+		// Enable v1beta3 if we are testing that version.
+		EnableV1Beta3:    testapi.Version() == "v1beta3",
+		Authorizer:       apiserver.NewAlwaysAllowAuthorizer(),
+		AdmissionControl: admit.NewAlwaysAdmit(),
 	})

 	restClient := client.NewOrDie(&client.Config{Host: s.URL, Version: testapi.Version()})
--- a/test/integration/secret_test.go
+++ b/test/integration/secret_test.go
@@ -66,8 +66,10 @@ func TestSecrets(t *testing.T) {
 		EnableUISupport:       false,
 		EnableIndex:           true,
 		APIPrefix:             "/api",
-		Authorizer:            apiserver.NewAlwaysAllowAuthorizer(),
-		AdmissionControl:      admit.NewAlwaysAdmit(),
+		// Enable v1beta3 if we are testing that version.
+		EnableV1Beta3:    testapi.Version() == "v1beta3",
+		Authorizer:       apiserver.NewAlwaysAllowAuthorizer(),
+		AdmissionControl: admit.NewAlwaysAdmit(),
 	})

 	framework.DeleteAllEtcdKeys()
--- a/test/integration/service_account_test.go
+++ b/test/integration/service_account_test.go
@@ -416,9 +416,11 @@ func startServiceAccountTestServer(t *testing.T) (*client.Client, client.Config,
 		EnableUISupport:   false,
 		EnableIndex:       true,
 		APIPrefix:         "/api",
-		Authenticator:     authenticator,
-		Authorizer:        authorizer,
-		AdmissionControl:  serviceAccountAdmission,
+		// Enable v1beta3 if we are testing that version.
+		EnableV1Beta3:    testapi.Version() == "v1beta3",
+		Authenticator:    authenticator,
+		Authorizer:       authorizer,
+		AdmissionControl: serviceAccountAdmission,
 	})

 	// Start the service account and service account token controllers
--- a/test/integration/utils.go
+++ b/test/integration/utils.go
@@ -80,8 +80,10 @@ func runAMaster(t *testing.T) (*master.Master, *httptest.Server) {
 		EnableProfiling:       true,
 		EnableUISupport:       false,
 		APIPrefix:             "/api",
-		Authorizer:            apiserver.NewAlwaysAllowAuthorizer(),
-		AdmissionControl:      admit.NewAlwaysAdmit(),
+		// Enable v1beta3 if we are testing that version.
+		EnableV1Beta3:    testapi.Version() == "v1beta3",
+		Authorizer:       apiserver.NewAlwaysAllowAuthorizer(),
+		AdmissionControl: admit.NewAlwaysAdmit(),
 	})

 	s := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {