Merge pull request #2058 from maiqueb/graduate-persistent-ips-api

openshift-merge-bot[bot] · web-flow · commit c1a063b1614a · 2025-01-10T18:38:40.000Z
CNV-47438: ipam, virt: graduate persistent ips feature gate to GA
diff --git a/features.md b/features.md
@@ -39,7 +39,6 @@
 | 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>  |
 | 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>  |
 | OnClusterBuild| | | <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>  |
-| PersistentIPsForVirtualization| | | <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>  |
 | PinnedImages| | | <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>  |
 | PlatformOperators| | | <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>  |
 | ProcMountType| | | <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>  |
@@ -80,6 +79,7 @@
 | NetworkLiveMigration| <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> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | NodeDisruptionPolicy| <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> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | OpenShiftPodSecurityAdmission| <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> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
+| PersistentIPsForVirtualization| <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> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | PrivateHostedZoneAWS| <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> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | SetEIPForNLBIngressController| <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> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | VSphereControlPlaneMachineSet| <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> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
diff --git a/features/features.go b/features/features.go
@@ -589,7 +589,7 @@ var (
 							contactPerson("mduarted").
 							productScope(ocpSpecific).
 							enhancementPR(legacyFeatureGateWithoutEnhancement).
-							enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+							enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
 							mustRegister()
 
 	FeatureGateClusterMonitoringConfig = newFeatureGate("ClusterMonitoringConfig").
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml b/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml
@@ -130,9 +130,6 @@
                     {
                         "name": "OnClusterBuild"
                     },
-                    {
-                        "name": "PersistentIPsForVirtualization"
-                    },
                     {
                         "name": "PinnedImages"
                     },
@@ -255,6 +252,9 @@
                     {
                         "name": "OpenShiftPodSecurityAdmission"
                     },
+                    {
+                        "name": "PersistentIPsForVirtualization"
+                    },
                     {
                         "name": "PrivateHostedZoneAWS"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml
@@ -130,9 +130,6 @@
                     {
                         "name": "OnClusterBuild"
                     },
-                    {
-                        "name": "PersistentIPsForVirtualization"
-                    },
                     {
                         "name": "PinnedImages"
                     },
@@ -255,6 +252,9 @@
                     {
                         "name": "OpenShiftPodSecurityAdmission"
                     },
+                    {
+                        "name": "PersistentIPsForVirtualization"
+                    },
                     {
                         "name": "PrivateHostedZoneAWS"
                     },

Original file line number	Diff line number	Diff line change
`@@ -130,9 +130,6 @@`
`130`	`130`	`{`
`131`	`131`	`"name": "OnClusterBuild"`
`132`	`132`	`},`
`133`		`- {`
`134`		`- "name": "PersistentIPsForVirtualization"`
`135`		`- },`
`136`	`133`	`{`
`137`	`134`	`"name": "PinnedImages"`
`138`	`135`	`},`
`@@ -255,6 +252,9 @@`
`255`	`252`	`{`
`256`	`253`	`"name": "OpenShiftPodSecurityAdmission"`
`257`	`254`	`},`
	`255`	`+ {`
	`256`	`+ "name": "PersistentIPsForVirtualization"`
	`257`	`+ },`
`258`	`258`	`{`
`259`	`259`	`"name": "PrivateHostedZoneAWS"`
`260`	`260`	`},`