From b26d126ba944e51224a4d819fde453ce7ef7ddf4 Mon Sep 17 00:00:00 2001 From: David Eads Date: Tue, 24 Apr 2018 10:16:59 -0400 Subject: [PATCH] core v1 API requires autoscaling/v1 to serve the Scale endpoint Kubernetes-commit: 1a753659cfc973e900620bf1443178b6cdda27e0 --- pkg/server/resourceconfig/helpers.go | 4 ++-- pkg/server/storage/resource_config.go | 12 ++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/pkg/server/resourceconfig/helpers.go b/pkg/server/resourceconfig/helpers.go index 3ac79b74a..ee0f08e5f 100644 --- a/pkg/server/resourceconfig/helpers.go +++ b/pkg/server/resourceconfig/helpers.go @@ -78,9 +78,9 @@ func MergeAPIResourceConfigs( if ok { if allAPIFlagValue == "false" { // Disable all group versions. - resourceConfig.DisableVersions(registry.RegisteredGroupVersions()...) + resourceConfig.DisableAll() } else if allAPIFlagValue == "true" { - resourceConfig.EnableVersions(registry.RegisteredGroupVersions()...) + resourceConfig.EnableAll() } } diff --git a/pkg/server/storage/resource_config.go b/pkg/server/storage/resource_config.go index 0a4470605..d16be4279 100644 --- a/pkg/server/storage/resource_config.go +++ b/pkg/server/storage/resource_config.go @@ -36,6 +36,18 @@ func NewResourceConfig() *ResourceConfig { return &ResourceConfig{GroupVersionConfigs: map[schema.GroupVersion]bool{}} } +func (o *ResourceConfig) DisableAll() { + for k := range o.GroupVersionConfigs { + o.GroupVersionConfigs[k] = false + } +} + +func (o *ResourceConfig) EnableAll() { + for k := range o.GroupVersionConfigs { + o.GroupVersionConfigs[k] = true + } +} + // DisableVersions disables the versions entirely. func (o *ResourceConfig) DisableVersions(versions ...schema.GroupVersion) { for _, version := range versions {