Merge pull request kubernetes#9269 from caesarxuchao/make-v1-enabled-…

…by-default Make v1 enabled by default
nuschk · Jun 4, 2015 · 5214465 · 5214465
2 parents 44f2c8f + 21bea6e
commit 5214465
Show file tree

Hide file tree

Showing 10 changed files with 8 additions and 21 deletions.
diff --git a/cmd/integration/integration.go b/cmd/integration/integration.go
@@ -164,7 +164,6 @@ func startComponents(firstManifestURL, secondManifestURL, apiVersion string) (st
 		ReadWritePort:         portNumber,
 		PublicAddress:         publicAddress,
 		CacheTimeout:          2 * time.Second,
-		EnableV1:              true,
 	})
 	handler.delegate = m.Handler
 

diff --git a/cmd/kube-apiserver/app/server.go b/cmd/kube-apiserver/app/server.go
@@ -282,8 +282,10 @@ func (s *APIServer) Run(_ []string) error {
 	disableV1beta3 := disableAllAPIs
 	disableV1beta3 = !s.getRuntimeConfigValue("api/v1beta3", !disableV1beta3)
 
-	// V1 is disabled by default. Users can enable it using "api/v1={true}".
-	_, enableV1 := s.RuntimeConfig["api/v1"]
+	// "api/v1={true|false} allows users to enable/disable v1 API.
+	// This takes preference over api/all and api/legacy, if specified.
+	disableV1 := disableAllAPIs
+	disableV1 = !s.getRuntimeConfigValue("api/v1", !disableV1)
 
 	// TODO: expose same flags as client.BindClientConfigFlags but for a server
 	clientConfig := &client.Config{
@@ -371,7 +373,7 @@ func (s *APIServer) Run(_ []string) error {
 		Authorizer:             authorizer,
 		AdmissionControl:       admissionController,
 		DisableV1Beta3:         disableV1beta3,
-		EnableV1:               enableV1,
+		DisableV1:              disableV1,
 		MasterServiceNamespace: s.MasterServiceNamespace,
 		ClusterName:            s.ClusterName,
 		ExternalHost:           s.ExternalHost,

diff --git a/hack/update-swagger-spec.sh b/hack/update-swagger-spec.sh
@@ -53,7 +53,6 @@ kube::log::status "Starting kube-apiserver"
   --etcd_servers="http://${ETCD_HOST}:${ETCD_PORT}" \
   --public_address_override="127.0.0.1" \
   --kubelet_port=${KUBELET_PORT} \
-  --runtime_config=api/v1 \
   --runtime_config=api/legacy=false \
   --service-cluster-ip-range="10.0.0.0/24" 1>&2 &
 APISERVER_PID=$!

diff --git a/pkg/master/master.go b/pkg/master/master.go
@@ -91,8 +91,8 @@ type Config struct {
 	EnableSwaggerSupport bool
 	// allow v1beta3 to be conditionally disabled
 	DisableV1Beta3 bool
-	// allow v1 to be conditionally enabled
-	EnableV1 bool
+	// allow v1 to be conditionally disabled
+	DisableV1 bool
 	// allow downstream consumers to disable the index route
 	EnableIndex           bool
 	EnableProfiling       bool
@@ -313,7 +313,7 @@ func New(c *Config) *Master {
 		authorizer:            c.Authorizer,
 		admissionControl:      c.AdmissionControl,
 		v1beta3:               !c.DisableV1Beta3,
-		v1:                    c.EnableV1,
+		v1:                    !c.DisableV1,
 		requestContextMapper:  c.RequestContextMapper,
 
 		cacheTimeout: c.CacheTimeout,

diff --git a/test/integration/auth_test.go b/test/integration/auth_test.go
@@ -397,7 +397,6 @@ func TestAuthModeAlwaysAllow(t *testing.T) {
 		APIPrefix:             "/api",
 		Authorizer:            apiserver.NewAlwaysAllowAuthorizer(),
 		AdmissionControl:      admit.NewAlwaysAdmit(),
-		EnableV1:              true,
 	})
 
 	transport := http.DefaultTransport
@@ -538,7 +537,6 @@ func TestAuthModeAlwaysDeny(t *testing.T) {
 		APIPrefix:             "/api",
 		Authorizer:            apiserver.NewAlwaysDenyAuthorizer(),
 		AdmissionControl:      admit.NewAlwaysAdmit(),
-		EnableV1:              true,
 	})
 
 	transport := http.DefaultTransport
@@ -607,7 +605,6 @@ func TestAliceNotForbiddenOrUnauthorized(t *testing.T) {
 		Authenticator:         getTestTokenAuth(),
 		Authorizer:            allowAliceAuthorizer{},
 		AdmissionControl:      admit.NewAlwaysAdmit(),
-		EnableV1:              true,
 	})
 
 	previousResourceVersion := make(map[string]float64)
@@ -695,7 +692,6 @@ func TestBobIsForbidden(t *testing.T) {
 		Authenticator:         getTestTokenAuth(),
 		Authorizer:            allowAliceAuthorizer{},
 		AdmissionControl:      admit.NewAlwaysAdmit(),
-		EnableV1:              true,
 	})
 
 	transport := http.DefaultTransport
@@ -757,7 +753,6 @@ func TestUnknownUserIsUnauthorized(t *testing.T) {
 		Authenticator:         getTestTokenAuth(),
 		Authorizer:            allowAliceAuthorizer{},
 		AdmissionControl:      admit.NewAlwaysAdmit(),
-		EnableV1:              true,
 	})
 
 	transport := http.DefaultTransport
@@ -838,7 +833,6 @@ func TestNamespaceAuthorization(t *testing.T) {
 		Authenticator:         getTestTokenAuth(),
 		Authorizer:            a,
 		AdmissionControl:      admit.NewAlwaysAdmit(),
-		EnableV1:              true,
 	})
 
 	previousResourceVersion := make(map[string]float64)
@@ -954,7 +948,6 @@ func TestKindAuthorization(t *testing.T) {
 		Authenticator:         getTestTokenAuth(),
 		Authorizer:            a,
 		AdmissionControl:      admit.NewAlwaysAdmit(),
-		EnableV1:              true,
 	})
 
 	previousResourceVersion := make(map[string]float64)
@@ -1057,7 +1050,6 @@ func TestReadOnlyAuthorization(t *testing.T) {
 		Authenticator:         getTestTokenAuth(),
 		Authorizer:            a,
 		AdmissionControl:      admit.NewAlwaysAdmit(),
-		EnableV1:              true,
 	})
 
 	transport := http.DefaultTransport

diff --git a/test/integration/framework/master_utils.go b/test/integration/framework/master_utils.go
@@ -272,7 +272,6 @@ func RunAMaster(t *testing.T) (*master.Master, *httptest.Server) {
 		APIPrefix:         "/api",
 		Authorizer:        apiserver.NewAlwaysAllowAuthorizer(),
 		AdmissionControl:  admit.NewAlwaysAdmit(),
-		EnableV1:          true,
 	})
 
 	s := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {

diff --git a/test/integration/scheduler_test.go b/test/integration/scheduler_test.go
@@ -75,7 +75,6 @@ func TestUnschedulableNodes(t *testing.T) {
 		APIPrefix:             "/api",
 		Authorizer:            apiserver.NewAlwaysAllowAuthorizer(),
 		AdmissionControl:      admit.NewAlwaysAdmit(),
-		EnableV1:              true,
 	})
 
 	restClient := client.NewOrDie(&client.Config{Host: s.URL, Version: testapi.Version()})

diff --git a/test/integration/secret_test.go b/test/integration/secret_test.go
@@ -68,7 +68,6 @@ func TestSecrets(t *testing.T) {
 		APIPrefix:             "/api",
 		Authorizer:            apiserver.NewAlwaysAllowAuthorizer(),
 		AdmissionControl:      admit.NewAlwaysAdmit(),
-		EnableV1:              true,
 	})
 
 	framework.DeleteAllEtcdKeys()

diff --git a/test/integration/service_account_test.go b/test/integration/service_account_test.go
@@ -419,7 +419,6 @@ func startServiceAccountTestServer(t *testing.T) (*client.Client, client.Config,
 		Authenticator:     authenticator,
 		Authorizer:        authorizer,
 		AdmissionControl:  serviceAccountAdmission,
-		EnableV1:          true,
 	})
 
 	// Start the service account and service account token controllers

diff --git a/test/integration/utils.go b/test/integration/utils.go
@@ -82,7 +82,6 @@ func runAMaster(t *testing.T) (*master.Master, *httptest.Server) {
 		APIPrefix:             "/api",
 		Authorizer:            apiserver.NewAlwaysAllowAuthorizer(),
 		AdmissionControl:      admit.NewAlwaysAdmit(),
-		EnableV1:              true,
 	})
 
 	s := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {