diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go index 259be4e9b49..9acaa6208ae 100644 --- a/pkg/features/kube_features.go +++ b/pkg/features/kube_features.go @@ -1612,10 +1612,12 @@ var defaultVersionedKubernetesFeatureGates = map[featuregate.Feature]featuregate StreamingCollectionEncodingToJSON: { {Version: version.MustParse("1.33"), Default: true, PreRelease: featuregate.Beta}, + {Version: version.MustParse("1.34"), Default: true, PreRelease: featuregate.GA, LockToDefault: true}, }, StreamingCollectionEncodingToProtobuf: { {Version: version.MustParse("1.33"), Default: true, PreRelease: featuregate.Beta}, + {Version: version.MustParse("1.34"), Default: true, PreRelease: featuregate.GA, LockToDefault: true}, }, StrictIPCIDRValidation: { 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..23d3913f197 100644 --- a/staging/src/k8s.io/apiserver/pkg/features/kube_features.go +++ b/staging/src/k8s.io/apiserver/pkg/features/kube_features.go @@ -381,10 +381,12 @@ var defaultVersionedKubernetesFeatureGates = map[featuregate.Feature]featuregate StreamingCollectionEncodingToJSON: { {Version: version.MustParse("1.33"), Default: true, PreRelease: featuregate.Beta}, + {Version: version.MustParse("1.34"), Default: true, PreRelease: featuregate.GA, LockToDefault: true}, }, StreamingCollectionEncodingToProtobuf: { {Version: version.MustParse("1.33"), Default: true, PreRelease: featuregate.Beta}, + {Version: version.MustParse("1.34"), Default: true, PreRelease: featuregate.GA, LockToDefault: true}, }, StrictCostEnforcementForVAP: { diff --git a/test/compatibility_lifecycle/reference/versioned_feature_list.yaml b/test/compatibility_lifecycle/reference/versioned_feature_list.yaml index 4ab412e079f..f6c5a3575f0 100644 --- a/test/compatibility_lifecycle/reference/versioned_feature_list.yaml +++ b/test/compatibility_lifecycle/reference/versioned_feature_list.yaml @@ -1519,12 +1519,20 @@ lockToDefault: false preRelease: Beta version: "1.33" + - default: true + lockToDefault: true + preRelease: GA + version: "1.34" - name: StreamingCollectionEncodingToProtobuf versionedSpecs: - default: true lockToDefault: false preRelease: Beta version: "1.33" + - default: true + lockToDefault: true + preRelease: GA + version: "1.34" - name: StrictCostEnforcementForVAP versionedSpecs: - default: false