Merge pull request #2429 from pablintino/mco-1759-nonreconcilable-changes-feature-gate

openshift-merge-bot[bot] · web-flow · commit 9f3619037736 · 2025-08-05T09:23:48.000Z
MCO-1759: Add NonReconcilableMC Feature Gate
diff --git a/features.md b/features.md
@@ -49,6 +49,7 @@
 | InsightsConfigAPI| | | <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>  |
 | InsightsOnDemandDataGather| | | <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>  |
 | InsightsRuntimeExtractor| | | <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>  |
+| IrreconcilableMachineConfig| | | <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>  |
 | KMSEncryptionProvider| | | <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>  |
 | MachineAPIMigration| | | <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>  |
 | ManagedBootImagesAzure| | | <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
@@ -866,4 +866,12 @@ var (
 						enhancementPR("https://github.com/openshift/enhancements/pull/1492").
 						enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
 						mustRegister()
+
+	FeatureGateIrreconcilableMachineConfig = newFeatureGate("IrreconcilableMachineConfig").
+						reportProblemsToJiraComponent("MachineConfigOperator").
+						contactPerson("pabrodri").
+						productScope(ocpSpecific).
+						enhancementPR("https://github.com/openshift/enhancements/pull/1785").
+						enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+						mustRegister()
 )
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml b/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml
@@ -124,6 +124,9 @@
                     {
                         "name": "InsightsRuntimeExtractor"
                     },
+                    {
+                        "name": "IrreconcilableMachineConfig"
+                    },
                     {
                         "name": "KMSEncryptionProvider"
                     },
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml
@@ -194,6 +194,9 @@
                     {
                         "name": "InsightsRuntimeExtractor"
                     },
+                    {
+                        "name": "IrreconcilableMachineConfig"
+                    },
                     {
                         "name": "KMSEncryptionProvider"
                     },
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml
@@ -200,6 +200,9 @@
                     {
                         "name": "InsightsRuntimeExtractor"
                     },
+                    {
+                        "name": "IrreconcilableMachineConfig"
+                    },
                     {
                         "name": "KMSEncryptionProvider"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml
@@ -127,6 +127,9 @@
                     {
                         "name": "InsightsRuntimeExtractor"
                     },
+                    {
+                        "name": "IrreconcilableMachineConfig"
+                    },
                     {
                         "name": "KMSEncryptionProvider"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml
@@ -176,6 +176,9 @@
                     {
                         "name": "InsightsRuntimeExtractor"
                     },
+                    {
+                        "name": "IrreconcilableMachineConfig"
+                    },
                     {
                         "name": "KMSEncryptionProvider"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml
@@ -185,6 +185,9 @@
                     {
                         "name": "InsightsRuntimeExtractor"
                     },
+                    {
+                        "name": "IrreconcilableMachineConfig"
+                    },
                     {
                         "name": "KMSEncryptionProvider"
                     },

Original file line number	Diff line number	Diff line change
`@@ -124,6 +124,9 @@`
`124`	`124`	`{`
`125`	`125`	`"name": "InsightsRuntimeExtractor"`
`126`	`126`	`},`
	`127`	`+ {`
	`128`	`+ "name": "IrreconcilableMachineConfig"`
	`129`	`+ },`
`127`	`130`	`{`
`128`	`131`	`"name": "KMSEncryptionProvider"`
`129`	`132`	`},`
Original file line number	Diff line number	Diff line change
`@@ -194,6 +194,9 @@`
`194`	`194`	`{`
`195`	`195`	`"name": "InsightsRuntimeExtractor"`
`196`	`196`	`},`
	`197`	`+ {`
	`198`	`+ "name": "IrreconcilableMachineConfig"`
	`199`	`+ },`
`197`	`200`	`{`
`198`	`201`	`"name": "KMSEncryptionProvider"`
`199`	`202`	`},`
Original file line number	Diff line number	Diff line change
`@@ -200,6 +200,9 @@`
`200`	`200`	`{`
`201`	`201`	`"name": "InsightsRuntimeExtractor"`
`202`	`202`	`},`
	`203`	`+ {`
	`204`	`+ "name": "IrreconcilableMachineConfig"`
	`205`	`+ },`
`203`	`206`	`{`
`204`	`207`	`"name": "KMSEncryptionProvider"`
`205`	`208`	`},`
Original file line number	Diff line number	Diff line change
`@@ -127,6 +127,9 @@`
`127`	`127`	`{`
`128`	`128`	`"name": "InsightsRuntimeExtractor"`
`129`	`129`	`},`
	`130`	`+ {`
	`131`	`+ "name": "IrreconcilableMachineConfig"`
	`132`	`+ },`
`130`	`133`	`{`
`131`	`134`	`"name": "KMSEncryptionProvider"`
`132`	`135`	`},`
Original file line number	Diff line number	Diff line change
`@@ -176,6 +176,9 @@`
`176`	`176`	`{`
`177`	`177`	`"name": "InsightsRuntimeExtractor"`
`178`	`178`	`},`
	`179`	`+ {`
	`180`	`+ "name": "IrreconcilableMachineConfig"`
	`181`	`+ },`
`179`	`182`	`{`
`180`	`183`	`"name": "KMSEncryptionProvider"`
`181`	`184`	`},`
Original file line number	Diff line number	Diff line change
`@@ -185,6 +185,9 @@`
`185`	`185`	`{`
`186`	`186`	`"name": "InsightsRuntimeExtractor"`
`187`	`187`	`},`
	`188`	`+ {`
	`189`	`+ "name": "IrreconcilableMachineConfig"`
	`190`	`+ },`
`188`	`191`	`{`
`189`	`192`	`"name": "KMSEncryptionProvider"`
`190`	`193`	`},`