Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enable Aggregated Discovery for Beta #116108

Merged
merged 1 commit into from Mar 10, 2023
Merged

Enable Aggregated Discovery for Beta #116108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/controlplane/instance_test.go
View file
Open in desktop
Expand Up @@ -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()
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we need legacy here?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Storage version hash is omitted in aggregated discovery. This test specifically tests for the existence of storage version hash so it should continue to use the legacy discovery.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've added deprecating and planning for removing the StorageVersionHash to the apimachinery agenda for next meeting.

_, all, err := discover.ServerGroupsAndResources()
if err != nil {
t.Error(err)
Expand Down
2 changes: 1 addition & 1 deletion pkg/features/kube_features.go
View file
Open in desktop
Expand Up @@ -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},

Expand Down
2 changes: 1 addition & 1 deletion staging/src/k8s.io/apiserver/pkg/features/kube_features.go
View file
Open in desktop
Expand Up @@ -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},

Expand Down