Merge pull request #1681 from amoralej/fix-watcher-update

Fix the WatcherDecisionEngine image in openstackcontrolplane status

Author: openshift-merge-bot[bot]

pkg/openstack/watcher.go

@@ -160,7 +160,7 @@ func ReconcileWatcher(ctx context.Context, instance *corev1beta1.OpenStackContro
 		helper.GetLogger().Info("Watcher ready condition is true")
 		instance.Status.ContainerImages.WatcherAPIImage = version.Status.ContainerImages.WatcherAPIImage
 		instance.Status.ContainerImages.WatcherApplierImage = version.Status.ContainerImages.WatcherApplierImage
-		instance.Status.ContainerImages.WatcherDecisionEngineImage = version.Status.ContainerImages.WatcherApplierImage
+		instance.Status.ContainerImages.WatcherDecisionEngineImage = version.Status.ContainerImages.WatcherDecisionEngineImage
 		instance.Status.Conditions.MarkTrue(corev1beta1.OpenStackControlPlaneWatcherReadyCondition, corev1beta1.OpenStackControlPlaneWatcherReadyMessage)
 	} else {
 		// We want to mirror the condition of the highest priority from the Watcher resource into the instance

tests/functional/ctlplane/openstackoperator_controller_test.go

@@ -2169,6 +2169,11 @@ var _ = Describe("OpenStackOperator controller", func() {
 					k8s_corev1.ConditionTrue,
 				)
 			}, timeout, interval).Should(Succeed())
+
+			OSCtlplane := GetOpenStackControlPlane(names.OpenStackControlplaneName)
+			Expect(OSCtlplane.Status.ContainerImages.WatcherAPIImage).Should(Equal(ptr.To("quay.io/podified-master-centos9/openstack-watcher-api:current-podified")))
+			Expect(OSCtlplane.Status.ContainerImages.WatcherApplierImage).Should(Equal(ptr.To("quay.io/podified-master-centos9/openstack-watcher-applier:current-podified")))
+			Expect(OSCtlplane.Status.ContainerImages.WatcherDecisionEngineImage).Should(Equal(ptr.To("quay.io/podified-master-centos9/openstack-watcher-decision-engine:current-podified")))
 		})
 	})