diff --git a/features.md b/features.md index 0ac34d89187..9a3a3fa3575 100644 --- a/features.md +++ b/features.md @@ -42,14 +42,14 @@ | ServiceAccountTokenNodeBinding| | | 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 | | UserNamespacesSupport| | | Enabled | Enabled | Enabled | Enabled | | VSphereMultiVCenters| | | Enabled | Enabled | Enabled | Enabled | | VolumeGroupSnapshot| | | Enabled | Enabled | Enabled | Enabled | | ExternalOIDC| Enabled | | Enabled | Enabled | Enabled | Enabled | +| StreamingCollectionEncodingToJSON| Enabled | | Enabled | Enabled | Enabled | Enabled | +| StreamingCollectionEncodingToProtobuf| Enabled | | Enabled | Enabled | Enabled | Enabled | | AWSEFSDriverVolumeMetrics| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | | AdminNetworkPolicy| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | | AlibabaPlatform| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | diff --git a/features/features.go b/features/features.go index 83b7706fd10..1197af0eddd 100644 --- a/features/features.go +++ b/features/features.go @@ -388,6 +388,7 @@ var ( contactPerson("rofeldma"). productScope(kubernetes). enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade). + enableForClusterProfile(Hypershift, configv1.Default). mustRegister() FeatureStreamingCollectionEncodingToProtobuf = newFeatureGate("StreamingCollectionEncodingToProtobuf"). @@ -395,6 +396,7 @@ var ( contactPerson("rofeldma"). productScope(kubernetes). enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade). + enableForClusterProfile(Hypershift, configv1.Default). mustRegister() FeatureGateSignatureStores = newFeatureGate("SignatureStores"). diff --git a/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml b/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml index 4bd62c1ad6f..45045ac3711 100644 --- a/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml +++ b/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml @@ -139,12 +139,6 @@ { "name": "SigstoreImageVerification" }, - { - "name": "StreamingCollectionEncodingToJSON" - }, - { - "name": "StreamingCollectionEncodingToProtobuf" - }, { "name": "TranslateStreamCloseWebsocketRequests" }, @@ -264,6 +258,12 @@ { "name": "SetEIPForNLBIngressController" }, + { + "name": "StreamingCollectionEncodingToJSON" + }, + { + "name": "StreamingCollectionEncodingToProtobuf" + }, { "name": "VSphereControlPlaneMachineSet" },