Promote sdnLiveMigration featureGate to GA

Signed-off-by: Peng Liu <pliu@redhat.com>
openshift · Jan 31, 2024 · ca64d33 · ca64d33
1 parent 4a45f44
commit ca64d33
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 11 deletions.
diff --git a/config/v1/types_feature.go b/config/v1/types_feature.go
@@ -187,7 +187,6 @@ var FeatureSets = map[FeatureSet]*FeatureGateEnabledDisabled{
 		with(metricsServer).
 		with(installAlternateInfrastructureAWS).
 		without(clusterAPIInstall).
-		with(sdnLiveMigration).
 		with(mixedCPUsAllocation).
 		with(managedBootImages).
 		without(disableKubeletCloudCredentialProviders).
@@ -215,6 +214,7 @@ var defaultFeatures = &FeatureGateEnabledDisabled{
 		buildCSIVolumes,
 		kmsv1,
 		vSphereControlPlaneMachineset,
+		sdnLiveMigration,
 	},
 	Disabled: []FeatureGateDescription{
 		disableKubeletCloudCredentialProviders, // We do not currently ship the correct config to use the external credentials provider.

diff --git a/operator/v1/0000_70_cluster-network-operator_01-Default.crd.yaml b/operator/v1/0000_70_cluster-network-operator_01-Default.crd.yaml
@@ -695,6 +695,23 @@ spec:
                           defaults to 'true' and multicast configure is migrated.
                         type: boolean
                     type: object
+                  mode:
+                    description: mode indicates the mode of network migration. The
+                      supported values are "Live", "Offline" and omitted. A "Live"
+                      migration operation will not cause service interruption by migrating
+                      the CNI of each node one by one. The cluster network will work
+                      as normal during the network migration. An "Offline" migration
+                      operation will cause service interruption. During an "Offline"
+                      migration, two rounds of node reboots are required. The cluster
+                      network will be malfunctioning during the network migration.
+                      When omitted, this means no opinion and the platform is left
+                      to choose a reasonable default which is subject to change over
+                      time. The current default value is "Offline".
+                    enum:
+                    - Live
+                    - Offline
+                    - ""
+                    type: string
                   mtu:
                     description: mtu contains the MTU migration configuration. Set
                       this to allow changing the MTU values for the default network.

diff --git a/operator/v1/stable.network.testsuite.yaml b/operator/v1/stable.network.testsuite.yaml
@@ -255,11 +255,11 @@ tests:
               ipv6:
                 internalMasqueradeSubnet: "abcd:eff01:2345:6789::2345:6789/20"
     expectedError: "Invalid value: \"string\": each segment of an IPv6 address must be a hexadecimal number between 0 and FFFF, failed on segment 2"
-  - name: Should not be able to create migration mode
+  - name: Should be able to create migration mode
     initial: |
       apiVersion: operator.openshift.io/v1
       kind: Network
-      spec: 
+      spec:
         migration:
           mode: Live
     expected: |
@@ -269,7 +269,8 @@ tests:
         disableNetworkDiagnostics: false
         logLevel: Normal
         operatorLogLevel: Normal
-        migration: {}
+        migration:
+          mode: Live
   - name: "IPsec - Empty ipsecConfig is allowed in initial state"
     initial: |
       apiVersion: operator.openshift.io/v1

diff --git a/operator/v1/types_network.go b/operator/v1/types_network.go
@@ -157,7 +157,6 @@ type NetworkMigration struct {
 	// An "Offline" migration operation will cause service interruption. During an "Offline" migration, two rounds of node reboots are required. The cluster network will be malfunctioning during the network migration.
 	// When omitted, this means no opinion and the platform is left to choose a reasonable default which is subject to change over time.
 	// The current default value is "Offline".
-	// +openshift:enable:FeatureSets=CustomNoUpgrade;TechPreviewNoUpgrade
 	// +optional
 	Mode NetworkMigrationMode `json:"mode"`
 }

diff --git a/payload-manifests/featuregates/featureGate-Default.yaml b/payload-manifests/featuregates/featureGate-Default.yaml
@@ -70,9 +70,6 @@
                     {
                         "name": "MixedCPUsAllocation"
                     },
-                    {
-                        "name": "NetworkLiveMigration"
-                    },
                     {
                         "name": "NodeSwap"
                     },
@@ -132,6 +129,9 @@
                     {
                         "name": "KMSv1"
                     },
+                    {
+                        "name": "NetworkLiveMigration"
+                    },
                     {
                         "name": "OpenShiftPodSecurityAdmission"
                     },

diff --git a/payload-manifests/featuregates/featureGate-LatencySensitive.yaml b/payload-manifests/featuregates/featureGate-LatencySensitive.yaml
@@ -72,9 +72,6 @@
                     {
                         "name": "MixedCPUsAllocation"
                     },
-                    {
-                        "name": "NetworkLiveMigration"
-                    },
                     {
                         "name": "NodeSwap"
                     },
@@ -134,6 +131,9 @@
                     {
                         "name": "KMSv1"
                     },
+                    {
+                        "name": "NetworkLiveMigration"
+                    },
                     {
                         "name": "OpenShiftPodSecurityAdmission"
                     },