Add Condition when minor update is available

When there is a new AvailableVersion, which does not match the Deployed version, this adds a condition to reflect this. This can be used e.g. in CI to wait for the new AvailableVersion to be reflected when the OpenStackVersion was patched. But could be useful for other situations. Signed-off-by: Martin Schuppert <[email protected]>
openstack-k8s-operators · Dec 4, 2024 · afea586 · afea586
1 parent 25aa758
commit afea586
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 6 deletions.
diff --git a/apis/core/v1beta1/conditions.go b/apis/core/v1beta1/conditions.go
@@ -478,6 +478,8 @@ const (
 	OpenStackVersionMinorUpdateControlplane condition.Type = "MinorUpdateControlplane"
 
 	OpenStackVersionMinorUpdateDataplane condition.Type = "MinorUpdateDataplane"
+
+	OpenStackVersionMinorUpdateAvailable condition.Type = "MinorUpdateAvailable"
 )
 
 // Version Messages used by API objects.
@@ -506,4 +508,7 @@ const (
 
 	// OpenStackVersionMinorUpdateReadyErrorMessage
 	OpenStackVersionMinorUpdateReadyErrorMessage = "error occured %s"
+
+	// OpenStackVersionMinorUpdateAvailableMessage
+	OpenStackVersionMinorUpdateAvailableMessage = "update available"
 )
diff --git a/controllers/core/openstackversion_controller.go b/controllers/core/openstackversion_controller.go
@@ -301,6 +301,15 @@ func (r *OpenStackVersionReconciler) Reconcile(ctx context.Context, req ctrl.Req
 		Log.Info("Setting DeployedVersion")
 		instance.Status.DeployedVersion = &instance.Spec.TargetVersion
 	}
+	if instance.Status.AvailableVersion != nil &&
+		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)
+	}
 
 	return ctrl.Result{}, nil
 }

diff --git a/tests/functional/ctlplane/openstackversion_controller_test.go b/tests/functional/ctlplane/openstackversion_controller_test.go
@@ -96,8 +96,8 @@ var _ = Describe("OpenStackOperator controller", func() {
 				version := GetOpenStackVersion(names.OpenStackVersionName)
 				g.Expect(version).Should(Not(BeNil()))
 
-				g.Expect(*version.Status.AvailableVersion).Should(Equal("0.0.1"))
-				g.Expect(version.Spec.TargetVersion).Should(Equal("0.0.1"))
+				g.Expect(*version.Status.AvailableVersion).Should(ContainSubstring("0.0.1"))
+				g.Expect(version.Spec.TargetVersion).Should(ContainSubstring("0.0.1"))
 
 				g.Expect(version.Status.ContainerImages.AgentImage).ShouldNot(BeNil())
 				g.Expect(version.Status.ContainerImages.AnsibleeeImage).ShouldNot(BeNil())
@@ -291,15 +291,15 @@ var _ = Describe("OpenStackOperator controller", func() {
 				targetOvnControllerVersion = *version.Status.ContainerImages.OvnControllerImage
 				g.Expect(version).Should(Not(BeNil()))
 
-				g.Expect(*version.Status.AvailableVersion).Should(Equal("0.0.1"))
-				g.Expect(version.Spec.TargetVersion).Should(Equal("0.0.1"))
-
+				g.Expect(*version.Status.AvailableVersion).Should(ContainSubstring("0.0.1"))
+				g.Expect(version.Spec.TargetVersion).Should(ContainSubstring("0.0.1"))
+				updatedVersion = *version.Status.AvailableVersion
 			}, timeout, interval).Should(Succeed())
 
 			// inject an "old" version
 			Eventually(func(g Gomega) {
 				version := GetOpenStackVersion(names.OpenStackVersionName)
-				version.Status.ContainerImageVersionDefaults[initialVersion] = version.Status.ContainerImageVersionDefaults["0.0.1"]
+				version.Status.ContainerImageVersionDefaults[initialVersion] = version.Status.ContainerImageVersionDefaults[updatedVersion]
 				version.Status.ContainerImageVersionDefaults[initialVersion].OvnControllerImage = &testOvnControllerImage
 				g.Expect(th.K8sClient.Status().Update(th.Ctx, version)).To(Succeed())