From 361391117dcb5ab76dc06918d4165c6c644ad717 Mon Sep 17 00:00:00 2001 From: Jefftree Date: Mon, 9 Jan 2023 17:51:19 +0000 Subject: [PATCH] Enable aggregated discovery --- pkg/controlplane/instance_test.go | 2 +- pkg/features/kube_features.go | 2 +- staging/src/k8s.io/apiserver/pkg/features/kube_features.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/controlplane/instance_test.go b/pkg/controlplane/instance_test.go index d8348e27f68..a6b2853577f 100644 --- a/pkg/controlplane/instance_test.go +++ b/pkg/controlplane/instance_test.go @@ -301,7 +301,7 @@ func TestStorageVersionHashes(t *testing.T) { APIPath: "/api", ContentConfig: restclient.ContentConfig{NegotiatedSerializer: legacyscheme.Codecs}, } - discover := discovery.NewDiscoveryClientForConfigOrDie(c) + discover := discovery.NewDiscoveryClientForConfigOrDie(c).WithLegacy() _, all, err := discover.ServerGroupsAndResources() if err != nil { t.Error(err) diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go index 16569cd0269..cd5b8c90945 100644 --- a/pkg/features/kube_features.go +++ b/pkg/features/kube_features.go @@ -1089,7 +1089,7 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS // inherited features from generic apiserver, relisted here to get a conflict if it is changed // unintentionally on either side: - genericfeatures.AggregatedDiscoveryEndpoint: {Default: false, PreRelease: featuregate.Alpha}, + genericfeatures.AggregatedDiscoveryEndpoint: {Default: true, PreRelease: featuregate.Beta}, genericfeatures.APIListChunking: {Default: true, PreRelease: featuregate.Beta}, diff --git a/staging/src/k8s.io/apiserver/pkg/features/kube_features.go b/staging/src/k8s.io/apiserver/pkg/features/kube_features.go index 760da3734e4..d30ad3e6bbc 100644 --- a/staging/src/k8s.io/apiserver/pkg/features/kube_features.go +++ b/staging/src/k8s.io/apiserver/pkg/features/kube_features.go @@ -222,7 +222,7 @@ func init() { // To add a new feature, define a key for it above and add it here. The features will be // available throughout Kubernetes binaries. var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureSpec{ - AggregatedDiscoveryEndpoint: {Default: false, PreRelease: featuregate.Alpha}, + AggregatedDiscoveryEndpoint: {Default: true, PreRelease: featuregate.Beta}, APIListChunking: {Default: true, PreRelease: featuregate.Beta},