scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-03 19:58:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Stop exposing v1beta3 by default

Browse Source
This commit is contained in:
nikhiljindal
2015-06-29 19:30:14 -07:00
parent 1cf9a71aa2
commit c465a50891
10 changed files with 73 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/integration/integration.go
View File

@@ -152,6 +152,8 @@ func startComponents(firstManifestURL, secondManifestURL, apiVersion string) (st
glog.Fatalf("no public address for %s", host) glog.Fatalf("no public address for %s", host)
} }
// Enable v1beta3 in master only if we are starting the components for that api version.
enableV1Beta3 := apiVersion == "v1beta3"
// Create a master and install handlers into mux. // Create a master and install handlers into mux.
m := master.New(&master.Config{ m := master.New(&master.Config{
EtcdHelper: helper, EtcdHelper: helper,
@@ -160,6 +162,7 @@ func startComponents(firstManifestURL, secondManifestURL, apiVersion string) (st
EnableLogsSupport: false, EnableLogsSupport: false,
EnableProfiling: true, EnableProfiling: true,
APIPrefix: "/api", APIPrefix: "/api",
EnableV1Beta3: enableV1Beta3,
Authorizer: apiserver.NewAlwaysAllowAuthorizer(), Authorizer: apiserver.NewAlwaysAllowAuthorizer(),
AdmissionControl: admit.NewAlwaysAdmit(), AdmissionControl: admit.NewAlwaysAdmit(),
ReadWritePort: portNumber, ReadWritePort: portNumber,

9
cmd/kube-apiserver/app/server.go
View File

@@ -275,7 +275,6 @@ func (s *APIServer) Run(_ []string) error {
} }
// "api/legacy=false" allows users to disable legacy api versions. // "api/legacy=false" allows users to disable legacy api versions.
// Right now, v1beta1 and v1beta2 are considered legacy.
disableLegacyAPIs := false disableLegacyAPIs := false
legacyAPIFlagValue, ok := s.RuntimeConfig["api/legacy"] legacyAPIFlagValue, ok := s.RuntimeConfig["api/legacy"]
if ok && legacyAPIFlagValue == "false" { if ok && legacyAPIFlagValue == "false" {
@@ -283,10 +282,8 @@ func (s *APIServer) Run(_ []string) error {
} }
_ = disableLegacyAPIs // hush the compiler while we don't have legacy APIs to disable. _ = disableLegacyAPIs // hush the compiler while we don't have legacy APIs to disable.
// "api/v1beta3={true|false} allows users to enable/disable v1beta3 API. // v1beta3 is disabled by default. Users can enable it using "api/v1beta3=true"
// This takes preference over api/all and api/legacy, if specified. enableV1beta3 := s.getRuntimeConfigValue("api/v1beta3", false)
disableV1beta3 := disableAllAPIs
disableV1beta3 = !s.getRuntimeConfigValue("api/v1beta3", !disableV1beta3)
// "api/v1={true|false} allows users to enable/disable v1 API. // "api/v1={true|false} allows users to enable/disable v1 API.
// This takes preference over api/all and api/legacy, if specified. // This takes preference over api/all and api/legacy, if specified.
@@ -387,7 +384,7 @@ func (s *APIServer) Run(_ []string) error {
SupportsBasicAuth: len(s.BasicAuthFile) > 0, SupportsBasicAuth: len(s.BasicAuthFile) > 0,
Authorizer: authorizer, Authorizer: authorizer,
AdmissionControl: admissionController, AdmissionControl: admissionController,
DisableV1Beta3: disableV1beta3, EnableV1Beta3: enableV1beta3,
DisableV1: disableV1, DisableV1: disableV1,
MasterServiceNamespace: s.MasterServiceNamespace, MasterServiceNamespace: s.MasterServiceNamespace,
ClusterName: s.ClusterName, ClusterName: s.ClusterName,

2
pkg/api/registered/registered.go
View File

@@ -35,7 +35,7 @@ func init() {
} }
// The default list of supported api versions, in order of most preferred to the least. // The default list of supported api versions, in order of most preferred to the least.
defaultSupportedVersions := "v1,v1beta3" defaultSupportedVersions := "v1"
// Env var KUBE_API_VERSIONS is a comma separated list of API versions that should be registered in the scheme. // Env var KUBE_API_VERSIONS is a comma separated list of API versions that should be registered in the scheme.
// The versions should be in the order of most preferred to the least. // The versions should be in the order of most preferred to the least.
supportedVersions := os.Getenv("KUBE_API_VERSIONS") supportedVersions := os.Getenv("KUBE_API_VERSIONS")

6
pkg/master/master.go
View File

@@ -95,8 +95,8 @@ type Config struct {
EnableUISupport bool EnableUISupport bool
// allow downstream consumers to disable swagger // allow downstream consumers to disable swagger
EnableSwaggerSupport bool EnableSwaggerSupport bool
// allow v1beta3 to be conditionally disabled // allow v1beta3 to be conditionally enabled
DisableV1Beta3 bool EnableV1Beta3 bool
// allow v1 to be conditionally disabled // allow v1 to be conditionally disabled
DisableV1 bool DisableV1 bool
// allow downstream consumers to disable the index route // allow downstream consumers to disable the index route
@@ -337,7 +337,7 @@ func New(c *Config) *Master {
authenticator: c.Authenticator, authenticator: c.Authenticator,
authorizer: c.Authorizer, authorizer: c.Authorizer,
admissionControl: c.AdmissionControl, admissionControl: c.AdmissionControl,
v1beta3: !c.DisableV1Beta3, v1beta3: c.EnableV1Beta3,
v1: !c.DisableV1, v1: !c.DisableV1,
requestContextMapper: c.RequestContextMapper, requestContextMapper: c.RequestContextMapper,

60
test/integration/auth_test.go
View File

@@ -393,8 +393,10 @@ func TestAuthModeAlwaysAllow(t *testing.T) {
EnableUISupport: false, EnableUISupport: false,
EnableIndex: true, EnableIndex: true,
APIPrefix: "/api", APIPrefix: "/api",
Authorizer: apiserver.NewAlwaysAllowAuthorizer(), // enable v1beta3 if we are testing that api version.
AdmissionControl: admit.NewAlwaysAdmit(), EnableV1Beta3: testapi.Version() == "v1beta3",
Authorizer: apiserver.NewAlwaysAllowAuthorizer(),
AdmissionControl: admit.NewAlwaysAdmit(),
}) })
transport := http.DefaultTransport transport := http.DefaultTransport
@@ -509,8 +511,10 @@ func TestAuthModeAlwaysDeny(t *testing.T) {
EnableUISupport: false, EnableUISupport: false,
EnableIndex: true, EnableIndex: true,
APIPrefix: "/api", APIPrefix: "/api",
Authorizer: apiserver.NewAlwaysDenyAuthorizer(), // enable v1beta3 if we are testing that api version.
AdmissionControl: admit.NewAlwaysAdmit(), EnableV1Beta3: testapi.Version() == "v1beta3",
Authorizer: apiserver.NewAlwaysDenyAuthorizer(),
AdmissionControl: admit.NewAlwaysAdmit(),
}) })
transport := http.DefaultTransport transport := http.DefaultTransport
@@ -576,9 +580,11 @@ func TestAliceNotForbiddenOrUnauthorized(t *testing.T) {
EnableUISupport: false, EnableUISupport: false,
EnableIndex: true, EnableIndex: true,
APIPrefix: "/api", APIPrefix: "/api",
Authenticator: getTestTokenAuth(), // enable v1beta3 if we are testing that api version.
Authorizer: allowAliceAuthorizer{}, EnableV1Beta3: testapi.Version() == "v1beta3",
AdmissionControl: admit.NewAlwaysAdmit(), Authenticator: getTestTokenAuth(),
Authorizer: allowAliceAuthorizer{},
AdmissionControl: admit.NewAlwaysAdmit(),
}) })
previousResourceVersion := make(map[string]float64) previousResourceVersion := make(map[string]float64)
@@ -663,9 +669,11 @@ func TestBobIsForbidden(t *testing.T) {
EnableUISupport: false, EnableUISupport: false,
EnableIndex: true, EnableIndex: true,
APIPrefix: "/api", APIPrefix: "/api",
Authenticator: getTestTokenAuth(), // enable v1beta3 if we are testing that api version.
Authorizer: allowAliceAuthorizer{}, EnableV1Beta3: testapi.Version() == "v1beta3",
AdmissionControl: admit.NewAlwaysAdmit(), Authenticator: getTestTokenAuth(),
Authorizer: allowAliceAuthorizer{},
AdmissionControl: admit.NewAlwaysAdmit(),
}) })
transport := http.DefaultTransport transport := http.DefaultTransport
@@ -724,9 +732,11 @@ func TestUnknownUserIsUnauthorized(t *testing.T) {
EnableUISupport: false, EnableUISupport: false,
EnableIndex: true, EnableIndex: true,
APIPrefix: "/api", APIPrefix: "/api",
Authenticator: getTestTokenAuth(), // enable v1beta3 if we are testing that api version.
Authorizer: allowAliceAuthorizer{}, EnableV1Beta3: testapi.Version() == "v1beta3",
AdmissionControl: admit.NewAlwaysAdmit(), Authenticator: getTestTokenAuth(),
Authorizer: allowAliceAuthorizer{},
AdmissionControl: admit.NewAlwaysAdmit(),
}) })
transport := http.DefaultTransport transport := http.DefaultTransport
@@ -804,9 +814,11 @@ func TestNamespaceAuthorization(t *testing.T) {
EnableUISupport: false, EnableUISupport: false,
EnableIndex: true, EnableIndex: true,
APIPrefix: "/api", APIPrefix: "/api",
Authenticator: getTestTokenAuth(), // enable v1beta3 if we are testing that api version.
Authorizer: a, EnableV1Beta3: testapi.Version() == "v1beta3",
AdmissionControl: admit.NewAlwaysAdmit(), Authenticator: getTestTokenAuth(),
Authorizer: a,
AdmissionControl: admit.NewAlwaysAdmit(),
}) })
previousResourceVersion := make(map[string]float64) previousResourceVersion := make(map[string]float64)
@@ -919,9 +931,11 @@ func TestKindAuthorization(t *testing.T) {
EnableUISupport: false, EnableUISupport: false,
EnableIndex: true, EnableIndex: true,
APIPrefix: "/api", APIPrefix: "/api",
Authenticator: getTestTokenAuth(), // enable v1beta3 if we are testing that api version.
Authorizer: a, EnableV1Beta3: testapi.Version() == "v1beta3",
AdmissionControl: admit.NewAlwaysAdmit(), Authenticator: getTestTokenAuth(),
Authorizer: a,
AdmissionControl: admit.NewAlwaysAdmit(),
}) })
previousResourceVersion := make(map[string]float64) previousResourceVersion := make(map[string]float64)
@@ -1021,9 +1035,11 @@ func TestReadOnlyAuthorization(t *testing.T) {
EnableUISupport: false, EnableUISupport: false,
EnableIndex: true, EnableIndex: true,
APIPrefix: "/api", APIPrefix: "/api",
Authenticator: getTestTokenAuth(), // enable v1beta3 if we are testing that api version.
Authorizer: a, EnableV1Beta3: testapi.Version() == "v1beta3",
AdmissionControl: admit.NewAlwaysAdmit(), Authenticator: getTestTokenAuth(),
Authorizer: a,
AdmissionControl: admit.NewAlwaysAdmit(),
}) })
transport := http.DefaultTransport transport := http.DefaultTransport

12
test/integration/framework/master_utils.go
View File

@@ -139,8 +139,10 @@ func startMasterOrDie(masterConfig *master.Config) (*master.Master, *httptest.Se
EnableProfiling: true, EnableProfiling: true,
EnableUISupport: false, EnableUISupport: false,
APIPrefix: "/api", APIPrefix: "/api",
Authorizer: apiserver.NewAlwaysAllowAuthorizer(), // Enable v1bewta3 if we are testing that version
AdmissionControl: admit.NewAlwaysAdmit(), EnableV1Beta3: testapi.Version() == "v1beta3",
Authorizer: apiserver.NewAlwaysAllowAuthorizer(),
AdmissionControl: admit.NewAlwaysAdmit(),
} }
} else { } else {
helper = masterConfig.EtcdHelper helper = masterConfig.EtcdHelper
@@ -270,8 +272,10 @@ func RunAMaster(t *testing.T) (*master.Master, *httptest.Server) {
EnableProfiling: true, EnableProfiling: true,
EnableUISupport: false, EnableUISupport: false,
APIPrefix: "/api", APIPrefix: "/api",
Authorizer: apiserver.NewAlwaysAllowAuthorizer(), // Enable v1bewta3 if we are testing that version
AdmissionControl: admit.NewAlwaysAdmit(), EnableV1Beta3: testapi.Version() == "v1beta3",
Authorizer: apiserver.NewAlwaysAllowAuthorizer(),
AdmissionControl: admit.NewAlwaysAdmit(),
}) })
s := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) { s := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {

6
test/integration/scheduler_test.go
View File

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

6
test/integration/secret_test.go
View File

@@ -66,8 +66,10 @@ func TestSecrets(t *testing.T) {
EnableUISupport: false, EnableUISupport: false,
EnableIndex: true, EnableIndex: true,
APIPrefix: "/api", APIPrefix: "/api",
Authorizer: apiserver.NewAlwaysAllowAuthorizer(), // Enable v1beta3 if we are testing that version.
AdmissionControl: admit.NewAlwaysAdmit(), EnableV1Beta3: testapi.Version() == "v1beta3",
Authorizer: apiserver.NewAlwaysAllowAuthorizer(),
AdmissionControl: admit.NewAlwaysAdmit(),
}) })
framework.DeleteAllEtcdKeys() framework.DeleteAllEtcdKeys()

8
test/integration/service_account_test.go
View File

@@ -416,9 +416,11 @@ func startServiceAccountTestServer(t *testing.T) (*client.Client, client.Config,
EnableUISupport: false, EnableUISupport: false,
EnableIndex: true, EnableIndex: true,
APIPrefix: "/api", APIPrefix: "/api",
Authenticator: authenticator, // Enable v1beta3 if we are testing that version.
Authorizer: authorizer, EnableV1Beta3: testapi.Version() == "v1beta3",
AdmissionControl: serviceAccountAdmission, Authenticator: authenticator,
Authorizer: authorizer,
AdmissionControl: serviceAccountAdmission,
}) })
// Start the service account and service account token controllers // Start the service account and service account token controllers

6
test/integration/utils.go
View File

@@ -80,8 +80,10 @@ func runAMaster(t *testing.T) (*master.Master, *httptest.Server) {
EnableProfiling: true, EnableProfiling: true,
EnableUISupport: false, EnableUISupport: false,
APIPrefix: "/api", APIPrefix: "/api",
Authorizer: apiserver.NewAlwaysAllowAuthorizer(), // Enable v1beta3 if we are testing that version.
AdmissionControl: admit.NewAlwaysAdmit(), EnableV1Beta3: testapi.Version() == "v1beta3",
Authorizer: apiserver.NewAlwaysAllowAuthorizer(),
AdmissionControl: admit.NewAlwaysAdmit(),
}) })
s := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) { s := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {