From 8ddf4401e5336192fcc2c9dd2377e50b811ff9fe Mon Sep 17 00:00:00 2001 From: Jefftree Date: Thu, 13 Mar 2025 17:58:06 +0000 Subject: [PATCH] Gate apidiscovery/v2beta1 serving with a feature gate Kubernetes-commit: 95d3d4a22d705ef6bf2d494c065743d356914e8d --- discovery/aggregated_discovery.go | 2 +- discovery/cached/memory/memcache_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/discovery/aggregated_discovery.go b/discovery/aggregated_discovery.go index f5eaaeda..82d46b48 100644 --- a/discovery/aggregated_discovery.go +++ b/discovery/aggregated_discovery.go @@ -156,7 +156,7 @@ func convertAPISubresource(parent metav1.APIResource, in apidiscovery.APISubreso return result, nil } -// Please note the functions below will be removed in v1.33. They facilitate conversion +// Please note the functions below will be removed in v1.35. They facilitate conversion // between the deprecated type apidiscoveryv2beta1.APIGroupDiscoveryList. // SplitGroupsAndResourcesV2Beta1 transforms "aggregated" discovery top-level structure into diff --git a/discovery/cached/memory/memcache_test.go b/discovery/cached/memory/memcache_test.go index f33ded83..1412a961 100644 --- a/discovery/cached/memory/memcache_test.go +++ b/discovery/cached/memory/memcache_test.go @@ -1425,7 +1425,7 @@ func TestMemCacheAggregatedServerGroups(t *testing.T) { return } // Content-type is "aggregated" discovery format. - w.Header().Set("Content-Type", discovery.AcceptV2Beta1) + w.Header().Set("Content-Type", discovery.AcceptV2) w.WriteHeader(http.StatusOK) w.Write(output) }))