Merge pull request #2179 from pliurh/live_migration

OCPBUGS-25760: Keep the live migration annotation consistant with the enhancement doc
openshift · Jan 11, 2024 · 4706ccf · 4706ccf
2 parents 975816e + 52947af
commit 4706ccf
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/pkg/controller/clusterconfig/migration_test.go b/pkg/controller/clusterconfig/migration_test.go
@@ -77,7 +77,7 @@ func TestPrepareOperatorConfigForNetworkTypeMigration(t *testing.T) {
 				ObjectMeta: metav1.ObjectMeta{
 					Name: "cluster",
 					Annotations: map[string]string{
-						"network.openshift.io/live-migration": "",
+						names.NetworkTypeMigrationAnnotation: "",
 					},
 				},
 				Spec: configv1.NetworkSpec{
@@ -120,7 +120,7 @@ func TestPrepareOperatorConfigForNetworkTypeMigration(t *testing.T) {
 				ObjectMeta: metav1.ObjectMeta{
 					Name: "cluster",
 					Annotations: map[string]string{
-						"network.openshift.io/live-migration": "",
+						names.NetworkTypeMigrationAnnotation: "",
 					},
 				},
 				Spec: configv1.NetworkSpec{
@@ -173,7 +173,7 @@ func TestPrepareOperatorConfigForNetworkTypeMigration(t *testing.T) {
 				ObjectMeta: metav1.ObjectMeta{
 					Name: "cluster",
 					Annotations: map[string]string{
-						"network.openshift.io/live-migration": "",
+						names.NetworkTypeMigrationAnnotation: "",
 					},
 				},
 				Spec: configv1.NetworkSpec{
@@ -226,7 +226,7 @@ func TestPrepareOperatorConfigForNetworkTypeMigration(t *testing.T) {
 				ObjectMeta: metav1.ObjectMeta{
 					Name: "cluster",
 					Annotations: map[string]string{
-						"network.openshift.io/live-migration": "",
+						names.NetworkTypeMigrationAnnotation: "",
 					},
 				},
 				Spec: configv1.NetworkSpec{
@@ -283,7 +283,7 @@ func TestPrepareOperatorConfigForNetworkTypeMigration(t *testing.T) {
 				ObjectMeta: metav1.ObjectMeta{
 					Name: "cluster",
 					Annotations: map[string]string{
-						"network.openshift.io/live-migration": "",
+						names.NetworkTypeMigrationAnnotation: "",
 					},
 				},
 				Spec: configv1.NetworkSpec{
@@ -331,7 +331,7 @@ func TestPrepareOperatorConfigForNetworkTypeMigration(t *testing.T) {
 				ObjectMeta: metav1.ObjectMeta{
 					Name: "cluster",
 					Annotations: map[string]string{
-						"network.openshift.io/live-migration": "",
+						names.NetworkTypeMigrationAnnotation: "",
 					},
 				},
 				Spec: configv1.NetworkSpec{
@@ -375,7 +375,7 @@ func TestPrepareOperatorConfigForNetworkTypeMigration(t *testing.T) {
 				ObjectMeta: metav1.ObjectMeta{
 					Name: "cluster",
 					Annotations: map[string]string{
-						"network.openshift.io/live-migration": "",
+						names.NetworkTypeMigrationAnnotation: "",
 					},
 				},
 				Spec: configv1.NetworkSpec{

diff --git a/pkg/names/names.go b/pkg/names/names.go
@@ -136,7 +136,7 @@ const ClusterNetworkOperatorJiraComponent = "Networking / cluster-network-operat
 
 // NetworkTypeMigrationAnnotation is an annotation on the OVN networks.operator.openshift.io CR to indicate
 // that executing network type live migration
-const NetworkTypeMigrationAnnotation = "network.openshift.io/live-migration"
+const NetworkTypeMigrationAnnotation = "network.openshift.io/network-type-migration"
 
 // MachineConfigPoolsUpdating is the reason string NetworkTypeMigrationTargetCNIInUse and NetworkTypeMigrationMTUReady
 // conditions to indicate if MCP is updating