mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 19:56:01 +00:00
Merge pull request #116108 from Jefftree/agg-discovery-enb
Enable Aggregated Discovery for Beta
This commit is contained in:
commit
d8fe845415
@ -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)
|
||||||
|
@ -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},
|
||||||
|
|
||||||
|
@ -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},
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user