Skip to content

Commit 8f67e0c

Browse files
committed
When OVNController is disabed, set current version images
When there is no nicMappings configured, the OVNController CR gets cleanup, because there is no need to run one on the ctlplane. In this case, ReconcileOVNController deletes the CR and returns ctrl.Result{}, nil . `status.deployedOVNVersion:` on the ctlplane gets set correct to the new version, but there was no change for the images on * instance.Status.ContainerImages.OvnControllerImage * instance.Status.ContainerImages.OvnControllerOvsImage As a result the minor update process gets stuck and never proceeds. Jira: OSPRH-12063 Signed-off-by: Martin Schuppert <mschuppert@redhat.com>
1 parent 4c23add commit 8f67e0c

1 file changed

Lines changed: 5 additions & 0 deletions

File tree

pkg/openstack/ovn.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,11 @@ func ReconcileOVNController(ctx context.Context, instance *corev1beta1.OpenStack
321321
if _, err := EnsureDeleted(ctx, helper, OVNController); err != nil {
322322
return false, err
323323
}
324+
325+
// for minor updates, update the ovn controller images to the one from the version
326+
instance.Status.ContainerImages.OvnControllerImage = version.Status.ContainerImages.OvnControllerImage
327+
instance.Status.ContainerImages.OvnControllerOvsImage = version.Status.ContainerImages.OvnControllerOvsImage
328+
324329
return true, nil
325330
}
326331

0 commit comments

Comments
 (0)