diff --git a/features.md b/features.md
index 39ddc217b9d..6d80ea4ae60 100644
--- a/features.md
+++ b/features.md
@@ -49,6 +49,8 @@
| ProcMountType| | | Enabled | Enabled | Enabled | Enabled |
| SignatureStores| | | Enabled | Enabled | Enabled | Enabled |
| SigstoreImageVerification| | | Enabled | Enabled | Enabled | Enabled |
+| StreamingCollectionEncodingToJSON| | | Enabled | Enabled | Enabled | Enabled |
+| StreamingCollectionEncodingToProtobuf| | | Enabled | Enabled | Enabled | Enabled |
| TranslateStreamCloseWebsocketRequests| | | Enabled | Enabled | Enabled | Enabled |
| UpgradeStatus| | | Enabled | Enabled | Enabled | Enabled |
| UserNamespacesPodSecurityStandards| | | Enabled | Enabled | Enabled | Enabled |
diff --git a/features/features.go b/features/features.go
index 86fba3b354b..be3c59cfb6a 100644
--- a/features/features.go
+++ b/features/features.go
@@ -808,6 +808,22 @@ var (
enableIn(configv1.DevPreviewNoUpgrade).
mustRegister()
+ FeatureStreamingCollectionEncodingToJSON = newFeatureGate("StreamingCollectionEncodingToJSON").
+ reportProblemsToJiraComponent("kube-apiserver").
+ contactPerson("rofeldma").
+ productScope(kubernetes).
+ enhancementPR("https://github.com/kubernetes/enhancements/issues/5116").
+ enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+ mustRegister()
+
+ FeatureStreamingCollectionEncodingToProtobuf = newFeatureGate("StreamingCollectionEncodingToProtobuf").
+ reportProblemsToJiraComponent("kube-apiserver").
+ contactPerson("rofeldma").
+ productScope(kubernetes).
+ enhancementPR("https://github.com/kubernetes/enhancements/issues/5116").
+ enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+ mustRegister()
+
FeatureGateGatewayAPIController = newFeatureGate("GatewayAPIController").
reportProblemsToJiraComponent("Routing").
contactPerson("miciah").
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml b/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml
index 47ed4f3d61f..bb1c0bd24d8 100644
--- a/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml
+++ b/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml
@@ -160,6 +160,12 @@
{
"name": "SigstoreImageVerificationPKI"
},
+ {
+ "name": "StreamingCollectionEncodingToJSON"
+ },
+ {
+ "name": "StreamingCollectionEncodingToProtobuf"
+ },
{
"name": "TranslateStreamCloseWebsocketRequests"
},
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml
index 4d843f294cc..54506182cb6 100644
--- a/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml
@@ -275,6 +275,12 @@
{
"name": "SigstoreImageVerificationPKI"
},
+ {
+ "name": "StreamingCollectionEncodingToJSON"
+ },
+ {
+ "name": "StreamingCollectionEncodingToProtobuf"
+ },
{
"name": "TranslateStreamCloseWebsocketRequests"
},
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml
index a6f5efc856b..48cad89ef3e 100644
--- a/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml
@@ -275,6 +275,12 @@
{
"name": "SigstoreImageVerification"
},
+ {
+ "name": "StreamingCollectionEncodingToJSON"
+ },
+ {
+ "name": "StreamingCollectionEncodingToProtobuf"
+ },
{
"name": "TranslateStreamCloseWebsocketRequests"
},
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml
index 31256f8da29..35e1f8c9b89 100644
--- a/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml
+++ b/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml
@@ -160,6 +160,12 @@
{
"name": "SigstoreImageVerificationPKI"
},
+ {
+ "name": "StreamingCollectionEncodingToJSON"
+ },
+ {
+ "name": "StreamingCollectionEncodingToProtobuf"
+ },
{
"name": "TranslateStreamCloseWebsocketRequests"
},
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml
index d929fa6096b..50840d95f01 100644
--- a/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml
@@ -275,6 +275,12 @@
{
"name": "SigstoreImageVerificationPKI"
},
+ {
+ "name": "StreamingCollectionEncodingToJSON"
+ },
+ {
+ "name": "StreamingCollectionEncodingToProtobuf"
+ },
{
"name": "TranslateStreamCloseWebsocketRequests"
},
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml
index 98bbb0ea13b..243fab5616b 100644
--- a/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml
@@ -275,6 +275,12 @@
{
"name": "SigstoreImageVerification"
},
+ {
+ "name": "StreamingCollectionEncodingToJSON"
+ },
+ {
+ "name": "StreamingCollectionEncodingToProtobuf"
+ },
{
"name": "TranslateStreamCloseWebsocketRequests"
},