Merge pull request #134230 from Jefftree/agg-v2beta1-lock

Lock AggregatedDiscoveryRemoveBetaType to true Kubernetes-commit: 6bcac876f841bd9a49f961620d2d2134c908f7d8

Author: k8s-publishing-bot

go.mod

@@ -50,7 +50,7 @@ require (
 gopkg.in/natefinch/lumberjack.v2 v2.2.1
 k8s.io/api v0.0.0-20251105015405-dd26ad10fd6e
 k8s.io/apimachinery v0.0.0-20251104194212-729c13d7df38
-k8s.io/client-go v0.0.0-20251105003230-5aa3ca7f2ac5
+k8s.io/client-go v0.0.0-20251105163311-7d09f53b04bd
 k8s.io/component-base v0.0.0-20251105043606-09c454e1f74b
 k8s.io/klog/v2 v2.130.1
 k8s.io/kms v0.0.0-20251031154137-67fac28309db

go.sum

@@ -303,8 +303,8 @@ k8s.io/api v0.0.0-20251105015405-dd26ad10fd6e h1:mo0m8qt3RGonvE9QzGm1NXcsb7ht6AI
 k8s.io/api v0.0.0-20251105015405-dd26ad10fd6e/go.mod h1:WAtHXlm214kKcYg1bP2G5eefhLoi/NCF6sxUeTjUXMs=
 k8s.io/apimachinery v0.0.0-20251104194212-729c13d7df38 h1:5jRAlNQwmLaPNhf9mfhacvZKFF8fE4nfULiBul0PrGM=
 k8s.io/apimachinery v0.0.0-20251104194212-729c13d7df38/go.mod h1:dR9KPaf5L0t2p9jZg/wCGB4b3ma2sXZ2zdNqILs+Sak=
-k8s.io/client-go v0.0.0-20251105003230-5aa3ca7f2ac5 h1:zfG89yYdzEweXvymwXD810niLOIvcKD0qq67yJVKxbQ=
-k8s.io/client-go v0.0.0-20251105003230-5aa3ca7f2ac5/go.mod h1:0nAtsAwkk8yBzjuzDlbrxZghpDWfhA2alzTAVP+GyyM=
+k8s.io/client-go v0.0.0-20251105163311-7d09f53b04bd h1:3i087DvI/zJ9Vl4YdVq1A4h5HoJMHlNTmiHKWdJOQ8A=
+k8s.io/client-go v0.0.0-20251105163311-7d09f53b04bd/go.mod h1:aSLSvCyHgh6llJnMW07M1FzR6u6WJG5HBG3v3OwfqLg=
 k8s.io/component-base v0.0.0-20251105043606-09c454e1f74b h1:iZ59BHeRkNAM5RSutSryNx9qtrgT7YPSM5HanS+GXVw=
 k8s.io/component-base v0.0.0-20251105043606-09c454e1f74b/go.mod h1:ccVXlbwyM8koWd6+OylPWi8m3aunkoPzcQcSbVvTHrk=
 k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=

pkg/endpoints/discovery/aggregated/handler_test.go

@@ -39,6 +39,7 @@ import (
 "k8s.io/apimachinery/pkg/runtime/schema"
 runtimeserializer "k8s.io/apimachinery/pkg/runtime/serializer"
 utilruntime "k8s.io/apimachinery/pkg/util/runtime"
+utilversion "k8s.io/apimachinery/pkg/util/version"
 "k8s.io/apimachinery/pkg/version"
 apidiscoveryv2conversion "k8s.io/apiserver/pkg/apis/apidiscovery/v2"
 discoveryendpoint "k8s.io/apiserver/pkg/endpoints/discovery/aggregated"
@@ -190,6 +191,7 @@ func TestBasicResponseProtobuf(t *testing.T) {
 
 // V2Beta1 should still be served
 func TestV2Beta1SkewSupport(t *testing.T) {
+featuregatetesting.SetFeatureGateEmulationVersionDuringTest(t, utilfeature.DefaultFeatureGate, utilversion.MustParse("1.34"))
 featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.AggregatedDiscoveryRemoveBetaType, false)
 manager := discoveryendpoint.NewResourceManager("apis")
 

pkg/endpoints/discovery/aggregated/wrapper_test.go

@@ -24,6 +24,7 @@ import (
 "testing"
 
 "github.com/stretchr/testify/assert"
+"k8s.io/apimachinery/pkg/util/version"
 "k8s.io/apiserver/pkg/endpoints/request"
 genericfeatures "k8s.io/apiserver/pkg/features"
 utilfeature "k8s.io/apiserver/pkg/util/feature"
@@ -61,6 +62,7 @@ func (f fakeHTTPHandler) ServeHTTP(resp http.ResponseWriter, req *http.Request)
 }
 
 func TestAggregationEnabled(t *testing.T) {
+featuregatetesting.SetFeatureGateEmulationVersionDuringTest(t, utilfeature.DefaultFeatureGate, version.MustParse("1.34"))
 unaggregated := fakeHTTPHandler{data: "unaggregated"}
 aggregated := fakeHTTPHandler{data: "aggregated"}
 wrapped := WrapAggregatedDiscoveryToHandler(unaggregated, aggregated)

pkg/features/kube_features.go

@@ -325,6 +325,7 @@ var defaultVersionedKubernetesFeatureGates = map[featuregate.Feature]featuregate
 AggregatedDiscoveryRemoveBetaType: {
 {Version: version.MustParse("1.0"), Default: false, PreRelease: featuregate.GA},
 {Version: version.MustParse("1.33"), Default: true, PreRelease: featuregate.Deprecated},
+{Version: version.MustParse("1.35"), Default: true, PreRelease: featuregate.Deprecated, LockToDefault: true},
 },
 
 AllowParsingUserUIDFromCertAuth: {