diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go index 259be4e9b49..f1d4870d5c1 100644 --- a/pkg/features/kube_features.go +++ b/pkg/features/kube_features.go @@ -1725,6 +1725,7 @@ var defaultVersionedKubernetesFeatureGates = map[featuregate.Feature]featuregate genericfeatures.APIServerTracing: { {Version: version.MustParse("1.22"), Default: false, PreRelease: featuregate.Alpha}, {Version: version.MustParse("1.27"), Default: true, PreRelease: featuregate.Beta}, + {Version: version.MustParse("1.34"), Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.37 }, genericfeatures.APIServingWithRoutine: { diff --git a/staging/src/k8s.io/apiserver/pkg/features/kube_features.go b/staging/src/k8s.io/apiserver/pkg/features/kube_features.go index 60b45e63a24..95337f5910b 100644 --- a/staging/src/k8s.io/apiserver/pkg/features/kube_features.go +++ b/staging/src/k8s.io/apiserver/pkg/features/kube_features.go @@ -273,6 +273,7 @@ var defaultVersionedKubernetesFeatureGates = map[featuregate.Feature]featuregate APIServerTracing: { {Version: version.MustParse("1.22"), Default: false, PreRelease: featuregate.Alpha}, {Version: version.MustParse("1.27"), Default: true, PreRelease: featuregate.Beta}, + {Version: version.MustParse("1.34"), Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.37 }, APIServingWithRoutine: { diff --git a/test/compatibility_lifecycle/reference/versioned_feature_list.yaml b/test/compatibility_lifecycle/reference/versioned_feature_list.yaml index 4ab412e079f..cdc94465cd5 100644 --- a/test/compatibility_lifecycle/reference/versioned_feature_list.yaml +++ b/test/compatibility_lifecycle/reference/versioned_feature_list.yaml @@ -125,6 +125,10 @@ lockToDefault: false preRelease: Beta version: "1.27" + - default: true + lockToDefault: true + preRelease: GA + version: "1.34" - name: APIServingWithRoutine versionedSpecs: - default: false