Merge pull request #9269 from caesarxuchao/make-v1-enabled-by-default

Make v1 enabled by default
This commit is contained in:
Quinton Hoole
2015-06-04 13:29:48 -07:00
10 changed files with 8 additions and 21 deletions

View File

@@ -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,