ovn: remove redundant removes for ready status when disabled

Ihar Hrachyshka · Ihar Hrachyshka · commit c13dcf8535fb · 2024-02-12T14:50:56.000Z
It is removed in the main reconcile entrypoint, so there is no need to
remove it inside per-CRD reconcile functions.
diff --git a/pkg/openstack/ovn.go b/pkg/openstack/ovn.go
@@ -73,7 +73,6 @@ func ReconcileOVNDbClusters(ctx context.Context, instance *corev1beta1.OpenStack
 			if _, err := EnsureDeleted(ctx, helper, OVNDBCluster); err != nil {
 				return false, err
 			}
-			instance.Status.Conditions.Remove(corev1beta1.OpenStackControlPlaneOVNReadyCondition)
 			continue
 		}
 
@@ -121,7 +120,6 @@ func ReconcileOVNNorthd(ctx context.Context, instance *corev1beta1.OpenStackCont
 		if _, err := EnsureDeleted(ctx, helper, OVNNorthd); err != nil {
 			return false, err
 		}
-		instance.Status.Conditions.Remove(corev1beta1.OpenStackControlPlaneOVNReadyCondition)
 		return false, nil
 	}
 
@@ -170,7 +168,6 @@ func ReconcileOVNController(ctx context.Context, instance *corev1beta1.OpenStack
 		if _, err := EnsureDeleted(ctx, helper, OVNController); err != nil {
 			return false, err
 		}
-		instance.Status.Conditions.Remove(corev1beta1.OpenStackControlPlaneOVNReadyCondition)
 		return false, nil
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,6 @@ func ReconcileOVNDbClusters(ctx context.Context, instance *corev1beta1.OpenStack`
`73`	`73`	`if _, err := EnsureDeleted(ctx, helper, OVNDBCluster); err != nil {`
`74`	`74`	`return false, err`
`75`	`75`	`}`
`76`		`- instance.Status.Conditions.Remove(corev1beta1.OpenStackControlPlaneOVNReadyCondition)`
`77`	`76`	`continue`
`78`	`77`	`}`
`79`	`78`
`@@ -121,7 +120,6 @@ func ReconcileOVNNorthd(ctx context.Context, instance *corev1beta1.OpenStackCont`
`121`	`120`	`if _, err := EnsureDeleted(ctx, helper, OVNNorthd); err != nil {`
`122`	`121`	`return false, err`
`123`	`122`	`}`
`124`		`- instance.Status.Conditions.Remove(corev1beta1.OpenStackControlPlaneOVNReadyCondition)`
`125`	`123`	`return false, nil`
`126`	`124`	`}`
`127`	`125`
`@@ -170,7 +168,6 @@ func ReconcileOVNController(ctx context.Context, instance *corev1beta1.OpenStack`
`170`	`168`	`if _, err := EnsureDeleted(ctx, helper, OVNController); err != nil {`
`171`	`169`	`return false, err`
`172`	`170`	`}`
`173`		`- instance.Status.Conditions.Remove(corev1beta1.OpenStackControlPlaneOVNReadyCondition)`
`174`	`171`	`return false, nil`
`175`	`172`	`}`
`176`	`173`