Merge pull request openshift#2381 from dobsonj/STOR-2462

openshift-merge-bot[bot] · web-flow · commit fed56f2794b1 · 2025-07-21T07:26:33.000Z
STOR-2462: Add ExternalSnapshotMetadata FeatureGate
diff --git a/features.md b/features.md
@@ -9,6 +9,7 @@
 | ClusterVersionOperatorConfiguration| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | |  |
 | DualReplica| | | <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> | |  |
+| ExternalSnapshotMetadata| | | <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>  |
 | 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>  |
diff --git a/features/features.go b/features/features.go
@@ -465,6 +465,14 @@ var (
 					enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
 					mustRegister()
 
+	FeatureGateExternalSnapshotMetadata = newFeatureGate("ExternalSnapshotMetadata").
+						reportProblemsToJiraComponent("Storage / Kubernetes External Components").
+						contactPerson("jdobson").
+						productScope(kubernetes).
+						enhancementPR("https://github.com/kubernetes/enhancements/issues/3314").
+						enableIn(configv1.DevPreviewNoUpgrade).
+						mustRegister()
+
 	FeatureGateExternalOIDC = newFeatureGate("ExternalOIDC").
 				reportProblemsToJiraComponent("authentication").
 				contactPerson("liouk").
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml b/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml
@@ -76,6 +76,9 @@
                     {
                         "name": "ExternalOIDCWithUIDAndExtraClaimMappings"
                     },
+                    {
+                        "name": "ExternalSnapshotMetadata"
+                    },
                     {
                         "name": "GCPClusterHostedDNS"
                     },
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml
@@ -131,6 +131,9 @@
                     {
                         "name": "ExternalOIDCWithUIDAndExtraClaimMappings"
                     },
+                    {
+                        "name": "ExternalSnapshotMetadata"
+                    },
                     {
                         "name": "GCPClusterHostedDNS"
                     },
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml
@@ -33,6 +33,9 @@
                     {
                         "name": "Example2"
                     },
+                    {
+                        "name": "ExternalSnapshotMetadata"
+                    },
                     {
                         "name": "MachineAPIOperatorDisableMachineHealthCheckController"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml
@@ -79,6 +79,9 @@
                     {
                         "name": "ExternalOIDCWithUIDAndExtraClaimMappings"
                     },
+                    {
+                        "name": "ExternalSnapshotMetadata"
+                    },
                     {
                         "name": "GCPClusterHostedDNS"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml
@@ -116,6 +116,9 @@
                     {
                         "name": "ExternalOIDCWithUIDAndExtraClaimMappings"
                     },
+                    {
+                        "name": "ExternalSnapshotMetadata"
+                    },
                     {
                         "name": "GCPClusterHostedDNS"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml
@@ -33,6 +33,9 @@
                     {
                         "name": "Example2"
                     },
+                    {
+                        "name": "ExternalSnapshotMetadata"
+                    },
                     {
                         "name": "MachineAPIOperatorDisableMachineHealthCheckController"
                     },

Original file line number	Diff line number	Diff line change
`@@ -76,6 +76,9 @@`
`76`	`76`	`{`
`77`	`77`	`"name": "ExternalOIDCWithUIDAndExtraClaimMappings"`
`78`	`78`	`},`
	`79`	`+ {`
	`80`	`+ "name": "ExternalSnapshotMetadata"`
	`81`	`+ },`
`79`	`82`	`{`
`80`	`83`	`"name": "GCPClusterHostedDNS"`
`81`	`84`	`},`
Original file line number	Diff line number	Diff line change
`@@ -131,6 +131,9 @@`
`131`	`131`	`{`
`132`	`132`	`"name": "ExternalOIDCWithUIDAndExtraClaimMappings"`
`133`	`133`	`},`
	`134`	`+ {`
	`135`	`+ "name": "ExternalSnapshotMetadata"`
	`136`	`+ },`
`134`	`137`	`{`
`135`	`138`	`"name": "GCPClusterHostedDNS"`
`136`	`139`	`},`
Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,9 @@`
`33`	`33`	`{`
`34`	`34`	`"name": "Example2"`
`35`	`35`	`},`
	`36`	`+ {`
	`37`	`+ "name": "ExternalSnapshotMetadata"`
	`38`	`+ },`
`36`	`39`	`{`
`37`	`40`	`"name": "MachineAPIOperatorDisableMachineHealthCheckController"`
`38`	`41`	`},`
Original file line number	Diff line number	Diff line change
`@@ -79,6 +79,9 @@`
`79`	`79`	`{`
`80`	`80`	`"name": "ExternalOIDCWithUIDAndExtraClaimMappings"`
`81`	`81`	`},`
	`82`	`+ {`
	`83`	`+ "name": "ExternalSnapshotMetadata"`
	`84`	`+ },`
`82`	`85`	`{`
`83`	`86`	`"name": "GCPClusterHostedDNS"`
`84`	`87`	`},`
Original file line number	Diff line number	Diff line change
`@@ -116,6 +116,9 @@`
`116`	`116`	`{`
`117`	`117`	`"name": "ExternalOIDCWithUIDAndExtraClaimMappings"`
`118`	`118`	`},`
	`119`	`+ {`
	`120`	`+ "name": "ExternalSnapshotMetadata"`
	`121`	`+ },`
`119`	`122`	`{`
`120`	`123`	`"name": "GCPClusterHostedDNS"`
`121`	`124`	`},`