Skip to content

Commit f7686c0

Browse files
committed
Fix the WatcherDecisioniEngine image in openstackcontrolplane.status
Currently it points incorrectly to the WatcherApplier one so that it leads to error in the update case. I'm also validating the expected value in the functional tests. Signed-off-by: Alfredo Moralejo <[email protected]>
1 parent 476792c commit f7686c0

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

pkg/openstack/watcher.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ func ReconcileWatcher(ctx context.Context, instance *corev1beta1.OpenStackContro
160160
helper.GetLogger().Info("Watcher ready condition is true")
161161
instance.Status.ContainerImages.WatcherAPIImage = version.Status.ContainerImages.WatcherAPIImage
162162
instance.Status.ContainerImages.WatcherApplierImage = version.Status.ContainerImages.WatcherApplierImage
163-
instance.Status.ContainerImages.WatcherDecisionEngineImage = version.Status.ContainerImages.WatcherApplierImage
163+
instance.Status.ContainerImages.WatcherDecisionEngineImage = version.Status.ContainerImages.WatcherDecisionEngineImage
164164
instance.Status.Conditions.MarkTrue(corev1beta1.OpenStackControlPlaneWatcherReadyCondition, corev1beta1.OpenStackControlPlaneWatcherReadyMessage)
165165
} else {
166166
// We want to mirror the condition of the highest priority from the Watcher resource into the instance

tests/functional/ctlplane/openstackoperator_controller_test.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2169,6 +2169,11 @@ var _ = Describe("OpenStackOperator controller", func() {
21692169
k8s_corev1.ConditionTrue,
21702170
)
21712171
}, timeout, interval).Should(Succeed())
2172+
2173+
OSCtlplane := GetOpenStackControlPlane(names.OpenStackControlplaneName)
2174+
Expect(OSCtlplane.Status.ContainerImages.WatcherAPIImage).Should(Equal(ptr.To("quay.io/podified-master-centos9/openstack-watcher-api:current-podified")))
2175+
Expect(OSCtlplane.Status.ContainerImages.WatcherApplierImage).Should(Equal(ptr.To("quay.io/podified-master-centos9/openstack-watcher-applier:current-podified")))
2176+
Expect(OSCtlplane.Status.ContainerImages.WatcherDecisionEngineImage).Should(Equal(ptr.To("quay.io/podified-master-centos9/openstack-watcher-decision-engine:current-podified")))
21722177
})
21732178
})
21742179

0 commit comments

Comments
 (0)