Merge pull request #11737 from thockin/cleanup-remove-v1beta3

Remove v1beta3
2015-07-24 10:25:56 -07:00
parent 5c6f4f5906 1c3233a1d4
commit ae1c8e55ef
63 changed files with 85 additions and 24241 deletions
--- a/test/integration/auth_test.go
+++ b/test/integration/auth_test.go
@@ -410,10 +410,8 @@ func TestAuthModeAlwaysAllow(t *testing.T) {
 		EnableUISupport:       false,
 		EnableIndex:           true,
 		APIPrefix:             "/api",
-		// enable v1beta3 if we are testing that api version.
-		EnableV1Beta3:    testapi.Version() == "v1beta3",
-		Authorizer:       apiserver.NewAlwaysAllowAuthorizer(),
-		AdmissionControl: admit.NewAlwaysAdmit(),
+		Authorizer:            apiserver.NewAlwaysAllowAuthorizer(),
+		AdmissionControl:      admit.NewAlwaysAdmit(),
 	})

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

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

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

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

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

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

 	previousResourceVersion := make(map[string]float64)
@@ -1052,11 +1038,9 @@ func TestReadOnlyAuthorization(t *testing.T) {
 		EnableUISupport:       false,
 		EnableIndex:           true,
 		APIPrefix:             "/api",
-		// enable v1beta3 if we are testing that api version.
-		EnableV1Beta3:    testapi.Version() == "v1beta3",
-		Authenticator:    getTestTokenAuth(),
-		Authorizer:       a,
-		AdmissionControl: admit.NewAlwaysAdmit(),
+		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,10 +139,8 @@ func startMasterOrDie(masterConfig *master.Config) (*master.Master, *httptest.Se
 			EnableProfiling:   true,
 			EnableUISupport:   false,
 			APIPrefix:         "/api",
-			// Enable v1bewta3 if we are testing that version
-			EnableV1Beta3:    testapi.Version() == "v1beta3",
-			Authorizer:       apiserver.NewAlwaysAllowAuthorizer(),
-			AdmissionControl: admit.NewAlwaysAdmit(),
+			Authorizer:        apiserver.NewAlwaysAllowAuthorizer(),
+			AdmissionControl:  admit.NewAlwaysAdmit(),
 		}
 	} else {
 		helper = masterConfig.EtcdHelper
@@ -272,10 +270,8 @@ func RunAMaster(t *testing.T) (*master.Master, *httptest.Server) {
 		EnableProfiling:   true,
 		EnableUISupport:   false,
 		APIPrefix:         "/api",
-		// Enable v1bewta3 if we are testing that version
-		EnableV1Beta3:    testapi.Version() == "v1beta3",
-		Authorizer:       apiserver.NewAlwaysAllowAuthorizer(),
-		AdmissionControl: admit.NewAlwaysAdmit(),
+		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,10 +73,8 @@ func TestUnschedulableNodes(t *testing.T) {
 		EnableUISupport:       false,
 		EnableIndex:           true,
 		APIPrefix:             "/api",
-		// Enable v1beta3 if we are testing that version.
-		EnableV1Beta3:    testapi.Version() == "v1beta3",
-		Authorizer:       apiserver.NewAlwaysAllowAuthorizer(),
-		AdmissionControl: admit.NewAlwaysAdmit(),
+		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,10 +66,8 @@ func TestSecrets(t *testing.T) {
 		EnableUISupport:       false,
 		EnableIndex:           true,
 		APIPrefix:             "/api",
-		// Enable v1beta3 if we are testing that version.
-		EnableV1Beta3:    testapi.Version() == "v1beta3",
-		Authorizer:       apiserver.NewAlwaysAllowAuthorizer(),
-		AdmissionControl: admit.NewAlwaysAdmit(),
+		Authorizer:            apiserver.NewAlwaysAllowAuthorizer(),
+		AdmissionControl:      admit.NewAlwaysAdmit(),
 	})

 	framework.DeleteAllEtcdKeys()
--- a/test/integration/service_account_test.go
+++ b/test/integration/service_account_test.go
@@ -416,11 +416,9 @@ func startServiceAccountTestServer(t *testing.T) (*client.Client, client.Config,
 		EnableUISupport:   false,
 		EnableIndex:       true,
 		APIPrefix:         "/api",
-		// Enable v1beta3 if we are testing that version.
-		EnableV1Beta3:    testapi.Version() == "v1beta3",
-		Authenticator:    authenticator,
-		Authorizer:       authorizer,
-		AdmissionControl: serviceAccountAdmission,
+		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,10 +80,8 @@ func runAMaster(t *testing.T) (*master.Master, *httptest.Server) {
 		EnableProfiling:       true,
 		EnableUISupport:       false,
 		APIPrefix:             "/api",
-		// Enable v1beta3 if we are testing that version.
-		EnableV1Beta3:    testapi.Version() == "v1beta3",
-		Authorizer:       apiserver.NewAlwaysAllowAuthorizer(),
-		AdmissionControl: admit.NewAlwaysAdmit(),
+		Authorizer:            apiserver.NewAlwaysAllowAuthorizer(),
+		AdmissionControl:      admit.NewAlwaysAdmit(),
 	})

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