Enable third party resources.

This commit is contained in:
Brendan Burns 2016-03-09 19:52:29 -08:00
parent 0a28a38110
commit a0fcbd1495
3 changed files with 1 additions and 7 deletions

View File

@ -201,9 +201,6 @@ type ThirdPartyResourceList struct {
type APIVersion struct {
// Name of this version (e.g. 'v1').
Name string `json:"name,omitempty"`
// The API group to add this object into, default 'experimental'.
APIGroup string `json:"apiGroup,omitempty"`
}
// An internal object, used for versioned storage in etcd. Not exposed to the end user.

View File

@ -198,9 +198,6 @@ type ThirdPartyResourceList struct {
type APIVersion struct {
// Name of this version (e.g. 'v1').
Name string `json:"name,omitempty"`
// The API group to add this object into, default 'experimental'.
APIGroup string `json:"apiGroup,omitempty"`
}
// An internal object, used for versioned storage in etcd. Not exposed to the end user.

View File

@ -663,7 +663,7 @@ func (m *Master) thirdpartyapi(group, kind, version string) *apiserver.APIGroupV
// getExperimentalResources returns the resources for extensions api
func (m *Master) getExtensionResources(c *Config) map[string]rest.Storage {
// All resources except these are disabled by default.
enabledResources := sets.NewString("daemonsets", "deployments", "horizontalpodautoscalers", "ingresses", "jobs", "replicasets")
enabledResources := sets.NewString("daemonsets", "deployments", "horizontalpodautoscalers", "ingresses", "jobs", "replicasets", "thirdpartyresources")
resourceOverrides := m.ApiGroupVersionOverrides["extensions/v1beta1"].ResourceOverrides
isEnabled := func(resource string) bool {
// Check if the resource has been overriden.