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=OpenStackVersionMinorUpdateAvailable=True
Patch the targetVersion and wait for:
  wait --for condition=OpenStackVersionMinorUpdateAvailable=False

Author: hjensas

apis/bases/core.openstack.org_openstackversions.yaml

@@ -650,6 +650,8 @@ spec:
                   glanceWsgi:
                     type: string
                 type: object
+              state:
+                type: string
             type: object
         type: object
     served: true

apis/core/v1beta1/conditions.go

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

apis/core/v1beta1/openstackversion_types.go

@@ -195,6 +195,9 @@ type OpenStackVersionStatus struct {
 
 	//ObservedGeneration - the most recent generation observed for this object.
 	ObservedGeneration int64 `json:"observedGeneration,omitempty"`
+
+	// State - "UpdateAvailable" or "AtLatestKnown"
+	State string `json:"state,omitempty"`
 }
 
 // +kubebuilder:object:root=true

bindata/crds/crds.yaml

@@ -20845,6 +20845,8 @@ spec:
                   glanceWsgi:
                     type: string
                 type: object
+              state:
+                type: string
             type: object
         type: object
     served: true

config/crd/bases/core.openstack.org_openstackversions.yaml

@@ -650,6 +650,8 @@ spec:
                   glanceWsgi:
                     type: string
                 type: object
+              state:
+                type: string
             type: object
         type: object
     served: true

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)
@@ -397,8 +398,12 @@ func (r *OpenStackVersionReconciler) Reconcile(ctx context.Context, req ctrl.Req
 		instance.Status.Conditions.Set(condition.TrueCondition(
 			corev1beta1.OpenStackVersionMinorUpdateAvailable,
 			corev1beta1.OpenStackVersionMinorUpdateAvailableMessage))
-	} else {
-		instance.Status.Conditions.Remove(corev1beta1.OpenStackVersionMinorUpdateAvailable)
+	} else if *instance.Status.AvailableVersion == *instance.Status.DeployedVersion {
+		instance.Status.Conditions.Set(condition.FalseCondition(
+			corev1beta1.OpenStackVersionMinorUpdateAvailable,
+			corev1beta1.OpenStackVersionMinorUpdateAtLatestKnownReason,
+			condition.SeverityInfo,
+			corev1beta1.OpenStackVersionMinorUpdateAvailableMessage))
 	}
 
 	return ctrl.Result{}, nil