github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 12:43:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #116108 from Jefftree/agg-discovery-enb

Browse Source 
Enable Aggregated Discovery for Beta
This commit is contained in:
Kubernetes Prow Robot 2023-03-10 10:48:39 -08:00 committed by GitHub
commit d8fe845415
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/controlplane/instance_test.go
View File

@ -301,7 +301,7 @@ func TestStorageVersionHashes(t *testing.T) {
APIPath: "/api", APIPath: "/api",
ContentConfig: restclient.ContentConfig{NegotiatedSerializer: legacyscheme.Codecs}, ContentConfig: restclient.ContentConfig{NegotiatedSerializer: legacyscheme.Codecs},
} }
discover := discovery.NewDiscoveryClientForConfigOrDie(c) discover := discovery.NewDiscoveryClientForConfigOrDie(c).WithLegacy()
_, all, err := discover.ServerGroupsAndResources() _, all, err := discover.ServerGroupsAndResources()
if err != nil { if err != nil {
t.Error(err) t.Error(err)

2
pkg/features/kube_features.go
View File

@ -1102,7 +1102,7 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS
// inherited features from generic apiserver, relisted here to get a conflict if it is changed // inherited features from generic apiserver, relisted here to get a conflict if it is changed
// unintentionally on either side: // 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}, genericfeatures.APIListChunking: {Default: true, PreRelease: featuregate.Beta},

2
staging/src/k8s.io/apiserver/pkg/features/kube_features.go
View File

@ -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 // To add a new feature, define a key for it above and add it here. The features will be
// available throughout Kubernetes binaries. // available throughout Kubernetes binaries.
var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureSpec{ 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}, APIListChunking: {Default: true, PreRelease: featuregate.Beta},