Merge pull request #2779 from fangge1212/confidentialClusterFeatureGate

openshift-merge-bot[bot] · web-flow · commit f7b3bd900c75 · 2026-03-31T16:21:30.000Z
Add ConfidentialCluster feature gate
diff --git a/features.md b/features.md
@@ -9,6 +9,7 @@
 | ClusterAPIComputeInstall| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | |  |
 | ClusterAPIControlPlaneInstall| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | |  |
 | ClusterUpdatePreflight| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | |  |
+| ConfidentialCluster| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | |  |
 | Example2| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | |  |
 | ExternalOIDCExternalClaimsSourcing| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | |  |
 | ExternalSnapshotMetadata| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | |  |
diff --git a/features/features.go b/features/features.go
@@ -1020,4 +1020,12 @@ var (
 				enhancementPR("https://github.com/openshift/enhancements/pull/1910").
 				enable(inDevPreviewNoUpgrade(), inTechPreviewNoUpgrade()).
 				mustRegister()
+
+        FeatureGateConfidentialCluster = newFeatureGate("ConfidentialCluster").
+                                        reportProblemsToJiraComponent("ConfidentialClusters").
+                                        contactPerson("fjin").
+                                        productScope(ocpSpecific).
+                                        enhancementPR("https://github.com/openshift/enhancements/pull/1962").
+                                        enable(inDevPreviewNoUpgrade()).
+                                        mustRegister()
 )
diff --git a/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml b/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml
@@ -116,6 +116,9 @@
                     {
                         "name": "ClusterVersionOperatorConfiguration"
                     },
+                    {
+                        "name": "ConfidentialCluster"
+                    },
                     {
                         "name": "ConfigurablePKI"
                     },
diff --git a/payload-manifests/featuregates/featureGate-4-10-Hypershift-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-4-10-Hypershift-DevPreviewNoUpgrade.yaml
@@ -165,6 +165,9 @@
                     {
                         "name": "ClusterVersionOperatorConfiguration"
                     },
+                    {
+                        "name": "ConfidentialCluster"
+                    },
                     {
                         "name": "ConfigurablePKI"
                     },
diff --git a/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml b/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml
@@ -118,6 +118,9 @@
                     {
                         "name": "ClusterVersionOperatorConfiguration"
                     },
+                    {
+                        "name": "ConfidentialCluster"
+                    },
                     {
                         "name": "ConfigurablePKI"
                     },
diff --git a/payload-manifests/featuregates/featureGate-4-10-Hypershift-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-4-10-Hypershift-TechPreviewNoUpgrade.yaml
@@ -31,6 +31,9 @@
                     {
                         "name": "ClusterUpdatePreflight"
                     },
+                    {
+                        "name": "ConfidentialCluster"
+                    },
                     {
                         "name": "EventedPLEG"
                     },
diff --git a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml
@@ -113,6 +113,9 @@
                     {
                         "name": "ClusterVersionOperatorConfiguration"
                     },
+                    {
+                        "name": "ConfidentialCluster"
+                    },
                     {
                         "name": "ConfigurablePKI"
                     },
diff --git a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-DevPreviewNoUpgrade.yaml
@@ -144,6 +144,9 @@
                     {
                         "name": "ClusterVersionOperatorConfiguration"
                     },
+                    {
+                        "name": "ConfidentialCluster"
+                    },
                     {
                         "name": "ConfigurablePKI"
                     },
diff --git a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml
@@ -115,6 +115,9 @@
                     {
                         "name": "ClusterVersionOperatorConfiguration"
                     },
+                    {
+                        "name": "ConfidentialCluster"
+                    },
                     {
                         "name": "ConfigurablePKI"
                     },
diff --git a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-TechPreviewNoUpgrade.yaml
@@ -31,6 +31,9 @@
                     {
                         "name": "ClusterUpdatePreflight"
                     },
+                    {
+                        "name": "ConfidentialCluster"
+                    },
                     {
                         "name": "EventedPLEG"
                     },

Original file line number	Diff line number	Diff line change
`@@ -116,6 +116,9 @@`
`116`	`116`	`{`
`117`	`117`	`"name": "ClusterVersionOperatorConfiguration"`
`118`	`118`	`},`
	`119`	`+ {`
	`120`	`+ "name": "ConfidentialCluster"`
	`121`	`+ },`
`119`	`122`	`{`
`120`	`123`	`"name": "ConfigurablePKI"`
`121`	`124`	`},`
Original file line number	Diff line number	Diff line change
`@@ -165,6 +165,9 @@`
`165`	`165`	`{`
`166`	`166`	`"name": "ClusterVersionOperatorConfiguration"`
`167`	`167`	`},`
	`168`	`+ {`
	`169`	`+ "name": "ConfidentialCluster"`
	`170`	`+ },`
`168`	`171`	`{`
`169`	`172`	`"name": "ConfigurablePKI"`
`170`	`173`	`},`
Original file line number	Diff line number	Diff line change
`@@ -118,6 +118,9 @@`
`118`	`118`	`{`
`119`	`119`	`"name": "ClusterVersionOperatorConfiguration"`
`120`	`120`	`},`
	`121`	`+ {`
	`122`	`+ "name": "ConfidentialCluster"`
	`123`	`+ },`
`121`	`124`	`{`
`122`	`125`	`"name": "ConfigurablePKI"`
`123`	`126`	`},`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,9 @@`
`31`	`31`	`{`
`32`	`32`	`"name": "ClusterUpdatePreflight"`
`33`	`33`	`},`
	`34`	`+ {`
	`35`	`+ "name": "ConfidentialCluster"`
	`36`	`+ },`
`34`	`37`	`{`
`35`	`38`	`"name": "EventedPLEG"`
`36`	`39`	`},`
Original file line number	Diff line number	Diff line change
`@@ -113,6 +113,9 @@`
`113`	`113`	`{`
`114`	`114`	`"name": "ClusterVersionOperatorConfiguration"`
`115`	`115`	`},`
	`116`	`+ {`
	`117`	`+ "name": "ConfidentialCluster"`
	`118`	`+ },`
`116`	`119`	`{`
`117`	`120`	`"name": "ConfigurablePKI"`
`118`	`121`	`},`
Original file line number	Diff line number	Diff line change
`@@ -144,6 +144,9 @@`
`144`	`144`	`{`
`145`	`145`	`"name": "ClusterVersionOperatorConfiguration"`
`146`	`146`	`},`
	`147`	`+ {`
	`148`	`+ "name": "ConfidentialCluster"`
	`149`	`+ },`
`147`	`150`	`{`
`148`	`151`	`"name": "ConfigurablePKI"`
`149`	`152`	`},`
Original file line number	Diff line number	Diff line change
`@@ -115,6 +115,9 @@`
`115`	`115`	`{`
`116`	`116`	`"name": "ClusterVersionOperatorConfiguration"`
`117`	`117`	`},`
	`118`	`+ {`
	`119`	`+ "name": "ConfidentialCluster"`
	`120`	`+ },`
`118`	`121`	`{`
`119`	`122`	`"name": "ConfigurablePKI"`
`120`	`123`	`},`