Skip to content

Commit 882ce88

Browse files
committed
Re add Northd ExporterImage
Got incorrectly lost as part of [1]. [1] #1596 Related-Issue: https://issues.redhat.com/browse/OSPRH-12568
1 parent 8c3a003 commit 882ce88

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

pkg/openstack/ovn.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -272,6 +272,7 @@ func ReconcileOVNNorthd(ctx context.Context, instance *corev1beta1.OpenStackCont
272272

273273
if !instance.Spec.Ovn.Enabled {
274274
instance.Status.ContainerImages.OvnNorthdImage = nil
275+
instance.Status.ContainerImages.OpenstackNetworkExporterImage = nil
275276
if _, err := EnsureDeleted(ctx, helper, OVNNorthd); err != nil {
276277
return false, conditions, err
277278
}
@@ -351,6 +352,7 @@ func ReconcileOVNNorthd(ctx context.Context, instance *corev1beta1.OpenStackCont
351352
instance.Spec.Ovn.Template.OVNNorthd.DeepCopyInto(&OVNNorthd.Spec.OVNNorthdSpecCore)
352353

353354
OVNNorthd.Spec.ContainerImage = *version.Status.ContainerImages.OvnNorthdImage
355+
OVNNorthd.Spec.ExporterImage = *getImg(version.Status.ContainerImages.OpenstackNetworkExporterImage, &missingImageDefault)
354356

355357
err := controllerutil.SetControllerReference(helper.GetBeforeObject(), OVNNorthd, helper.GetScheme())
356358
if err != nil {
@@ -375,6 +377,7 @@ func ReconcileOVNNorthd(ctx context.Context, instance *corev1beta1.OpenStackCont
375377

376378
if OVNNorthd.Status.ObservedGeneration == OVNNorthd.Generation && OVNNorthd.IsReady() { //revive:disable:indent-error-flow
377379
instance.Status.ContainerImages.OvnNorthdImage = version.Status.ContainerImages.OvnNorthdImage
380+
instance.Status.ContainerImages.OpenstackNetworkExporterImage = version.Status.ContainerImages.OpenstackNetworkExporterImage
378381
return true, conditions, nil
379382
} else {
380383
return false, conditions, nil

0 commit comments

Comments
 (0)