From 4646bbb81be368152e8e2811fde5d2a3409bfe9e Mon Sep 17 00:00:00 2001
From: Pablo Rodriguez Nava <git@amail.pablintino.com>
Date: Fri, 24 Oct 2025 15:41:59 +0200
Subject: [PATCH] MCO-1941: Add OSStream FeatureGate

---
 features.md                                                | 1 +
 features/features.go                                       | 7 +++++++
 .../featuregates/featureGate-Hypershift-Default.yaml       | 3 +++
 .../featureGate-Hypershift-DevPreviewNoUpgrade.yaml        | 3 +++
 .../featureGate-Hypershift-TechPreviewNoUpgrade.yaml       | 3 +++
 .../featuregates/featureGate-SelfManagedHA-Default.yaml    | 3 +++
 .../featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml     | 3 +++
 .../featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml    | 3 +++
 8 files changed, 26 insertions(+)

diff --git a/features.md b/features.md
index b2a39b72f16..e6885282562 100644
--- a/features.md
+++ b/features.md
@@ -60,6 +60,7 @@
 | MutableCSINodeAllocatableCount| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | MutatingAdmissionPolicy| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | NutanixMultiSubnets| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
+| OSStreams| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | OVNObservability| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | SELinuxMount| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | SignatureStores| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
diff --git a/features/features.go b/features/features.go
index 4ea3797d595..0c88e7be759 100644
--- a/features/features.go
+++ b/features/features.go
@@ -893,4 +893,11 @@ var (
 							enhancementPR("https://github.com/kubernetes/enhancements/issues/4876").
 							enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
 							mustRegister()
+	FeatureGateOSStreams = newFeatureGate("OSStreams").
+				reportProblemsToJiraComponent("MachineConfigOperator").
+				contactPerson("pabrodri").
+				productScope(ocpSpecific).
+				enhancementPR("https://github.com/openshift/enhancements/pull/1874").
+				enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+				mustRegister()
 )
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml b/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml
index bb8ce50a9e7..69442203cd9 100644
--- a/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml
+++ b/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml
@@ -186,6 +186,9 @@
                     {
                         "name": "NutanixMultiSubnets"
                     },
+                    {
+                        "name": "OSStreams"
+                    },
                     {
                         "name": "OVNObservability"
                     },
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml
index f8391e55dd0..6f66b97c842 100644
--- a/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml
@@ -265,6 +265,9 @@
                     {
                         "name": "NutanixMultiSubnets"
                     },
+                    {
+                        "name": "OSStreams"
+                    },
                     {
                         "name": "OVNObservability"
                     },
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml
index fc9707c496d..702ff9cc545 100644
--- a/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml
@@ -268,6 +268,9 @@
                     {
                         "name": "NutanixMultiSubnets"
                     },
+                    {
+                        "name": "OSStreams"
+                    },
                     {
                         "name": "OVNObservability"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml
index 7276921d859..080c216964d 100644
--- a/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml
+++ b/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml
@@ -180,6 +180,9 @@
                     {
                         "name": "NutanixMultiSubnets"
                     },
+                    {
+                        "name": "OSStreams"
+                    },
                     {
                         "name": "OVNObservability"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml
index 5d8c11cadd5..908d6b78ef6 100644
--- a/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml
@@ -265,6 +265,9 @@
                     {
                         "name": "NutanixMultiSubnets"
                     },
+                    {
+                        "name": "OSStreams"
+                    },
                     {
                         "name": "OVNObservability"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml
index 1fd0b4aa12e..a407fe107e3 100644
--- a/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml
@@ -268,6 +268,9 @@
                     {
                         "name": "NutanixMultiSubnets"
                     },
+                    {
+                        "name": "OSStreams"
+                    },
                     {
                         "name": "OVNObservability"
                     },