github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-07-18 04:54:54 +00:00
Code Issues Projects Releases Wiki Activity

Lock AggregatedDiscoveryRemoveBetaType to true

Browse Source
This commit is contained in:
Jefftree
2025-09-23 18:37:45 +00:00
parent 4b5369008a
commit 762b458700
5 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/features/kube_features.go
View File

@@ -1833,6 +1833,7 @@ var defaultVersionedKubernetesFeatureGates = map[featuregate.Feature]featuregate
genericfeatures.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},
},
genericfeatures.AllowParsingUserUIDFromCertAuth: {

2
staging/src/k8s.io/apiserver/pkg/endpoints/discovery/aggregated/handler_test.go
View File

@@ -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")

2
staging/src/k8s.io/apiserver/pkg/endpoints/discovery/aggregated/wrapper_test.go
View File

@@ -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)

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

@@ -319,6 +319,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: {

4
test/compatibility_lifecycle/reference/versioned_feature_list.yaml
View File

@@ -11,6 +11,10 @@
lockToDefault: false
preRelease: Deprecated
version: "1.33"
- default: true
lockToDefault: true
preRelease: Deprecated
version: "1.35"
- name: AllowDNSOnlyNodeCSR
versionedSpecs:
- default: true