Do not rm MinorUpdateAvailable condition

Instead of removing the condtion, let's set it to False, with severity
Info and a message "AtLatestKnown".

With the CLI it is not possible to wait for a condition to be removed,

With this change we can do
  wait --for condition=MinorUpdateAvailable=True
Patch the targetVersion and wait for:
  wait --for condition=MinorUpdateAvailable=False

Author: hjensas

apis/core/v1beta1/conditions.go

@@ -540,4 +540,13 @@ const (
 
 	// OpenStackVersionMinorUpdateAvailableMessage
 	OpenStackVersionMinorUpdateAvailableMessage = "update available"
+
+	// OpenStackVersionMinorUpdateAtLatestKnownMessage
+	OpenStackVersionMinorUpdateAtLatestKnownMessage = "at latest known"
+)
+
+// Reasons used for API objects.
+const (
+	// OpenStackVersionMinorUpdateAtLatestKnownReason
+	OpenStackVersionMinorUpdateAtLatestKnownReason = "AtLatestKnown"
 )

controllers/core/openstackversion_controller.go

@@ -172,6 +172,7 @@ func (r *OpenStackVersionReconciler) Reconcile(ctx context.Context, req ctrl.Req
 			*condition.UnknownCondition(corev1beta1.OpenStackVersionMinorUpdateKeystone, condition.InitReason, string(corev1beta1.OpenStackVersionMinorUpdateInitMessage)),
 			*condition.UnknownCondition(corev1beta1.OpenStackVersionMinorUpdateControlplane, condition.InitReason, string(corev1beta1.OpenStackVersionMinorUpdateInitMessage)),
 			*condition.UnknownCondition(corev1beta1.OpenStackVersionMinorUpdateDataplane, condition.InitReason, string(corev1beta1.OpenStackVersionMinorUpdateInitMessage)),
+			*condition.UnknownCondition(corev1beta1.OpenStackVersionMinorUpdateAvailable, condition.InitReason, string(corev1beta1.OpenStackVersionMinorUpdateInitMessage)),
 		)
 	}
 	instance.Status.Conditions.Init(&cl)
@@ -392,13 +393,19 @@ func (r *OpenStackVersionReconciler) Reconcile(ctx context.Context, req ctrl.Req
 		Log.Info("Setting DeployedVersion")
 		instance.Status.DeployedVersion = &instance.Spec.TargetVersion
 	}
-	if instance.Status.DeployedVersion != nil &&
-		*instance.Status.AvailableVersion != *instance.Status.DeployedVersion {
-		instance.Status.Conditions.Set(condition.TrueCondition(
-			corev1beta1.OpenStackVersionMinorUpdateAvailable,
-			corev1beta1.OpenStackVersionMinorUpdateAvailableMessage))
-	} else {
-		instance.Status.Conditions.Remove(corev1beta1.OpenStackVersionMinorUpdateAvailable)
+
+	if instance.Status.DeployedVersion != nil {
+		if *instance.Status.AvailableVersion != *instance.Status.DeployedVersion {
+			instance.Status.Conditions.Set(condition.TrueCondition(
+				corev1beta1.OpenStackVersionMinorUpdateAvailable,
+				corev1beta1.OpenStackVersionMinorUpdateAvailableMessage))
+		} else {
+			instance.Status.Conditions.Set(condition.FalseCondition(
+				corev1beta1.OpenStackVersionMinorUpdateAvailable,
+				corev1beta1.OpenStackVersionMinorUpdateAtLatestKnownReason,
+				condition.SeverityInfo,
+				corev1beta1.OpenStackVersionMinorUpdateAvailableMessage))
+		}
 	}
 
 	return ctrl.Result{}, nil