Skip to content

Commit

Permalink
When OVNController is disabed, set current version images
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
stuggi authored and openshift-cherrypick-robot committed Nov 29, 2024
1 parent cfe6a0f commit 3e7431a
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions pkg/openstack/ovn.go
Original file line number Diff line number Diff line change
Expand Up @@ -321,6 +321,11 @@ func ReconcileOVNController(ctx context.Context, instance *corev1beta1.OpenStack
if _, err := EnsureDeleted(ctx, helper, OVNController); err != nil {
return false, err
}

// for minor updates, update the ovn controller images to the one from the version
instance.Status.ContainerImages.OvnControllerImage = version.Status.ContainerImages.OvnControllerImage
instance.Status.ContainerImages.OvnControllerOvsImage = version.Status.ContainerImages.OvnControllerOvsImage

return true, nil
}

Expand Down

0 comments on commit 3e7431a

Please sign in to comment.