Skip to content

Commit 2c61e8e

Browse files
committed
UPSTREAM: <carry>: Make streaming collection encoding off by default
Require an explicit opt in for special handling of collection encoding.
1 parent 1b3519c commit 2c61e8e

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

pkg/features/versioned_kube_features.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ var defaultVersionedKubernetesFeatureGates = map[featuregate.Feature]featuregate
3333
// {Version: version.MustParse("1.30"), Default: false, PreRelease: featuregate.Alpha},
3434
// },
3535
StreamingCollectionEncodingToJSON: {
36-
{Version: version.MustParse("1.33"), Default: true, PreRelease: featuregate.Beta},
36+
{Version: version.MustParse("1.31"), Default: false, PreRelease: featuregate.Beta},
3737
},
3838

3939
StreamingCollectionEncodingToProtobuf: {
40-
{Version: version.MustParse("1.33"), Default: true, PreRelease: featuregate.Beta},
40+
{Version: version.MustParse("1.31"), Default: false, PreRelease: featuregate.Beta},
4141
},
4242
}

staging/src/k8s.io/apiserver/pkg/features/kube_features.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -355,11 +355,11 @@ var defaultVersionedKubernetesFeatureGates = map[featuregate.Feature]featuregate
355355
// {Version: version.MustParse("1.30"), Default: false, PreRelease: featuregate.Alpha},
356356
// },
357357
StreamingCollectionEncodingToJSON: {
358-
{Version: version.MustParse("1.33"), Default: true, PreRelease: featuregate.Beta},
358+
{Version: version.MustParse("1.31"), Default: false, PreRelease: featuregate.Beta},
359359
},
360360

361361
StreamingCollectionEncodingToProtobuf: {
362-
{Version: version.MustParse("1.33"), Default: true, PreRelease: featuregate.Beta},
362+
{Version: version.MustParse("1.31"), Default: false, PreRelease: featuregate.Beta},
363363
},
364364
}
365365

0 commit comments

Comments
 (0)