Merge pull request #1212 from stuggi/fix_disabled_ovncontroller

openshift-merge-bot[bot] · web-flow · commit c8ed999c01b0 · 2024-11-29T13:27:17.000Z
When OVNController is disabed, set current version images
diff --git a/pkg/openstack/ovn.go b/pkg/openstack/ovn.go
@@ -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
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -321,6 +321,11 @@ func ReconcileOVNController(ctx context.Context, instance *corev1beta1.OpenStack`
`321`	`321`	`if _, err := EnsureDeleted(ctx, helper, OVNController); err != nil {`
`322`	`322`	`return false, err`
`323`	`323`	`}`
	`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`	`+`
`324`	`329`	`return true, nil`
`325`	`330`	`}`
`326`	`331`