Merge pull request #2766 from tmshort/sons-tp

openshift-merge-bot[bot] · web-flow · commit c73917c76a14 · 2026-03-20T10:58:32.000Z
OPRUN-4513: Move OLMv1 Single/Own Namespace support back to TP
diff --git a/features.md b/features.md
@@ -18,6 +18,7 @@
 | NewOLMBoxCutterRuntime| | | | <span style="background-color: #519450">Enabled</span> | | | | <span style="background-color: #519450">Enabled</span>  |
 | NewOLMCatalogdAPIV1Metas| | | | <span style="background-color: #519450">Enabled</span> | | | | <span style="background-color: #519450">Enabled</span>  |
 | NewOLMConfigAPI| | | | <span style="background-color: #519450">Enabled</span> | | | | <span style="background-color: #519450">Enabled</span>  |
+| NewOLMOwnSingleNamespace| | | | <span style="background-color: #519450">Enabled</span> | | | | <span style="background-color: #519450">Enabled</span>  |
 | NewOLMPreflightPermissionChecks| | | | <span style="background-color: #519450">Enabled</span> | | | | <span style="background-color: #519450">Enabled</span>  |
 | NoRegistryClusterInstall| | | | <span style="background-color: #519450">Enabled</span> | | | | <span style="background-color: #519450">Enabled</span>  |
 | ProvisioningRequestAvailable| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | |  |
@@ -78,7 +79,6 @@
 | MultiDiskSetup| | | <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>  |
 | NewOLM| | <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>  |
-| NewOLMOwnSingleNamespace| | <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>  |
 | NewOLMWebhookProviderOpenshiftServiceCA| | <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>  |
 | NoOverlayMode| | | <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>  |
diff --git a/features/features.go b/features/features.go
@@ -453,7 +453,7 @@ var (
 						contactPerson("nschieder").
 						productScope(ocpSpecific).
 						enhancementPR("https://github.com/openshift/enhancements/pull/1849").
-						enable(inClusterProfile(SelfManaged), inDefault(), inOKD(), inTechPreviewNoUpgrade(), inDevPreviewNoUpgrade()).
+						enable(inClusterProfile(SelfManaged), inTechPreviewNoUpgrade(), inDevPreviewNoUpgrade()).
 						mustRegister()
 
 	FeatureGateNewOLMWebhookProviderOpenshiftServiceCA = newFeatureGate("NewOLMWebhookProviderOpenshiftServiceCA").
diff --git a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml
@@ -233,6 +233,9 @@
                     {
                         "name": "NewOLMConfigAPI"
                     },
+                    {
+                        "name": "NewOLMOwnSingleNamespace"
+                    },
                     {
                         "name": "NewOLMPreflightPermissionChecks"
                     },
@@ -334,9 +337,6 @@
                     {
                         "name": "NewOLM"
                     },
-                    {
-                        "name": "NewOLMOwnSingleNamespace"
-                    },
                     {
                         "name": "NewOLMWebhookProviderOpenshiftServiceCA"
                     },
diff --git a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml
@@ -235,6 +235,9 @@
                     {
                         "name": "NewOLMConfigAPI"
                     },
+                    {
+                        "name": "NewOLMOwnSingleNamespace"
+                    },
                     {
                         "name": "NewOLMPreflightPermissionChecks"
                     },
@@ -336,9 +339,6 @@
                     {
                         "name": "NewOLM"
                     },
-                    {
-                        "name": "NewOLMOwnSingleNamespace"
-                    },
                     {
                         "name": "NewOLMWebhookProviderOpenshiftServiceCA"
                     },

Original file line number	Diff line number	Diff line change
`@@ -233,6 +233,9 @@`
`233`	`233`	`{`
`234`	`234`	`"name": "NewOLMConfigAPI"`
`235`	`235`	`},`
	`236`	`+ {`
	`237`	`+ "name": "NewOLMOwnSingleNamespace"`
	`238`	`+ },`
`236`	`239`	`{`
`237`	`240`	`"name": "NewOLMPreflightPermissionChecks"`
`238`	`241`	`},`
`@@ -334,9 +337,6 @@`
`334`	`337`	`{`
`335`	`338`	`"name": "NewOLM"`
`336`	`339`	`},`
`337`		`- {`
`338`		`- "name": "NewOLMOwnSingleNamespace"`
`339`		`- },`
`340`	`340`	`{`
`341`	`341`	`"name": "NewOLMWebhookProviderOpenshiftServiceCA"`
`342`	`342`	`},`
Original file line number	Diff line number	Diff line change
`@@ -235,6 +235,9 @@`
`235`	`235`	`{`
`236`	`236`	`"name": "NewOLMConfigAPI"`
`237`	`237`	`},`
	`238`	`+ {`
	`239`	`+ "name": "NewOLMOwnSingleNamespace"`
	`240`	`+ },`
`238`	`241`	`{`
`239`	`242`	`"name": "NewOLMPreflightPermissionChecks"`
`240`	`243`	`},`
`@@ -336,9 +339,6 @@`
`336`	`339`	`{`
`337`	`340`	`"name": "NewOLM"`
`338`	`341`	`},`
`339`		`- {`
`340`		`- "name": "NewOLMOwnSingleNamespace"`
`341`		`- },`
`342`	`342`	`{`
`343`	`343`	`"name": "NewOLMWebhookProviderOpenshiftServiceCA"`
`344`	`344`	`},`