openstackversion_controller_test.go

/*
Copyright 2024.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

    http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

package functional_test

import (
	"errors"
	"os"
	"strings"

	. "github.com/onsi/ginkgo/v2" //revive:disable:dot-imports
	. "github.com/onsi/gomega"    //revive:disable:dot-imports

	//revive:disable-next-line:dot-imports
	"github.com/openstack-k8s-operators/lib-common/modules/common/condition"
	. "github.com/openstack-k8s-operators/lib-common/modules/common/test/helpers"

	corev1 "github.com/openstack-k8s-operators/openstack-operator/api/core/v1beta1"
	dataplanev1 "github.com/openstack-k8s-operators/openstack-operator/api/dataplane/v1beta1"
	k8s_corev1 "k8s.io/api/core/v1"
	k8s_errors "k8s.io/apimachinery/pkg/api/errors"
	"k8s.io/apimachinery/pkg/types"
)

var _ = Describe("OpenStackOperator controller", func() {
	BeforeEach(func() {
		// lib-common uses OPERATOR_TEMPLATES env var to locate the "templates"
		// directory of the operator. We need to set them othervise lib-common
		// will fail to generate the ConfigMap as it does not find common.sh
		err := os.Setenv("OPERATOR_TEMPLATES", "../../templates")
		Expect(err).NotTo(HaveOccurred())

		// create cluster config map which is used to validate if cluster supports fips
		DeferCleanup(k8sClient.Delete, ctx, CreateClusterConfigCM())

	})

	When("A default OpenStackVersion instance is created with no Controlplane", func() {
		BeforeEach(func() {
			DeferCleanup(
				th.DeleteInstance,
				CreateOpenStackVersion(names.OpenStackVersionName, GetDefaultOpenStackVersionSpec()),
			)

			// Ensure that the version instance is not marked new any more
			// to avoid racing between the below cleanup removing the finalizer
			// and the controller adding the finalizer to the new instance.
			th.ExpectCondition(
				names.OpenStackVersionName,
				ConditionGetterFunc(OpenStackVersionConditionGetter),
				corev1.OpenStackVersionInitialized,
				k8s_corev1.ConditionTrue,
			)

			// we remove the finalizer as this is needed without the Controlplane
			DeferCleanup(
				OpenStackVersionRemoveFinalizer,
				ctx,
				names.OpenStackVersionName,
			)
		})

		It("should fail to create more than one OpenStackVersion", func() {

			instance := &corev1.OpenStackVersion{}
			instance.Namespace = names.Namespace
			instance.Name = "foo"
			err := k8sClient.Create(ctx, instance)

			Expect(err).Should(HaveOccurred())
			var statusError *k8s_errors.StatusError
			Expect(errors.As(err, &statusError)).To(BeTrue())
			Expect(statusError.ErrStatus.Details.Kind).To(Equal("OpenStackVersion"))
			Expect(statusError.ErrStatus.Message).To(
				ContainSubstring(
					"Forbidden: Only one OpenStackVersion instance is supported at this time."),
			)

		})

		It("should initialize container images", func() {
			Eventually(func(g Gomega) {

				version := GetOpenStackVersion(names.OpenStackVersionName)
				g.Expect(version).Should(Not(BeNil()))

				// no condition which reflects an update is available
				g.Expect(version.Status.Conditions.Has(corev1.OpenStackVersionMinorUpdateAvailable)).To(BeFalse())

				g.Expect(*version.Status.AvailableVersion).Should(ContainSubstring("0.0.1"))
				g.Expect(version.Spec.TargetVersion).Should(ContainSubstring("0.0.1"))

				g.Expect(version.Status.ContainerImages.AgentImage).ShouldNot(BeNil())
				g.Expect(version.Status.ContainerImages.AnsibleeeImage).ShouldNot(BeNil())
				g.Expect(version.Status.ContainerImages.AodhAPIImage).ShouldNot(BeNil())
				g.Expect(version.Status.ContainerImages.AodhEvaluatorImage).ShouldNot(BeNil())
				g.Expect(version.Status.ContainerImages.AodhListenerImage).ShouldNot(BeNil())
				g.Expect(version.Status.ContainerImages.AodhNotifierImage).ShouldNot(BeNil())
				g.Expect(version.Status.ContainerImages.ApacheImage).ShouldNot(BeNil())
				g.Expect(version.Status.ContainerImages.BarbicanAPIImage).ShouldNot(BeNil())
				g.Expect(version.Status.ContainerImages.BarbicanKeystoneListenerImage).ShouldNot(BeNil())
				g.Expect(version.Status.ContainerImages.BarbicanWorkerImage).ShouldNot(BeNil())
				g.Expect(version.Status.ContainerImages.CeilometerCentralImage).ShouldNot(BeNil())
				g.Expect(version.Status.ContainerImages.CeilometerComputeImage).ShouldNot(BeNil())
				g.Expect(version.Status.ContainerImages.CeilometerNotificationImage).ShouldNot(BeNil())
				g.Expect(version.Status.ContainerImages.CeilometerSgcoreImage).ShouldNot(BeNil())
				g.Expect(version.Status.ContainerImages.CeilometerProxyImage).ShouldNot(BeNil())
				g.Expect(version.Status.ContainerImages.CeilometerMysqldExporterImage).ShouldNot(BeNil())
				g.Expect(version.Status.ContainerImages.CinderAPIImage).ShouldNot(BeNil())
				g.Expect(version.Status.ContainerImages.CinderBackupImage).ShouldNot(BeNil())
				g.Expect(version.Status.ContainerImages.CinderSchedulerImage).ShouldNot(BeNil())
				g.Expect(version.Status.ContainerImages.DesignateAPIImage).ShouldNot(BeNil())
				g.Expect(version.Status.ContainerImages.DesignateBackendbind9Image).ShouldNot(BeNil())
				g.Expect(version.Status.ContainerImages.DesignateCentralImage).ShouldNot(BeNil())
				g.Expect(version.Status.ContainerImages.DesignateMdnsImage).ShouldNot(BeNil())
				g.Expect(version.Status.ContainerImages.DesignateProducerImage).ShouldNot(BeNil())
				g.Expect(version.Status.ContainerImages.DesignateUnboundImage).ShouldNot(BeNil())
				g.Expect(version.Status.ContainerImages.DesignateWorkerImage).ShouldNot(BeNil())
				g.Expect(version.Status.ContainerImages.EdpmFrrImage).ShouldNot(BeNil())
				// EdpmIscsidImage is deprecated - iscsid now runs on the host instead of in a container
				g.Expect(version.Status.ContainerImages.EdpmLogrotateCrondImage).ShouldNot(BeNil())
				g.Expect(version.Status.ContainerImages.EdpmMultipathdImage).ShouldNot(BeNil())
				g.Expect(version.Status.ContainerImages.EdpmNeutronMetadataAgentImage).ShouldNot(BeNil())
				g.Expect(version.Status.ContainerImages.EdpmNeutronSriovAgentImage).ShouldNot(BeNil())
				g.Expect(version.Status.ContainerImages.EdpmNodeExporterImage).ShouldNot(BeNil())
				g.Expect(version.Status.ContainerImages.EdpmKeplerImage).ShouldNot(BeNil())
				g.Expect(version.Status.ContainerImages.EdpmPodmanExporterImage).ShouldNot(BeNil())
				g.Expect(version.Status.ContainerImages.OpenstackNetworkExporterImage).ShouldNot(BeNil())
				g.Expect(version.Status.ContainerImages.EdpmOvnBgpAgentImage).ShouldNot(BeNil())
				g.Expect(version.Status.ContainerImages.GlanceAPIImage).ShouldNot(BeNil())
				g.Expect(version.Status.ContainerImages.HeatAPIImage).ShouldNot(BeNil())
				g.Expect(version.Status.ContainerImages.HeatCfnapiImage).ShouldNot(BeNil())
				g.Expect(version.Status.ContainerImages.HeatEngineImage).ShouldNot(BeNil())
				g.Expect(version.Status.ContainerImages.InfraDnsmasqImage).ShouldNot(BeNil())
				g.Expect(version.Status.ContainerImages.InfraMemcachedImage).ShouldNot(BeNil())
				g.Expect(version.Status.ContainerImages.InfraRedisImage).ShouldNot(BeNil())
				g.Expect(version.Status.ContainerImages.IronicAPIImage).ShouldNot(BeNil())
				g.Expect(version.Status.ContainerImages.IronicConductorImage).ShouldNot(BeNil())
				g.Expect(version.Status.ContainerImages.IronicInspectorImage).ShouldNot(BeNil())
				g.Expect(version.Status.ContainerImages.IronicNeutronAgentImage).ShouldNot(BeNil())
				g.Expect(version.Status.ContainerImages.IronicPxeImage).ShouldNot(BeNil())
				g.Expect(version.Status.ContainerImages.IronicPythonAgentImage).ShouldNot(BeNil())
				g.Expect(version.Status.ContainerImages.KeystoneAPIImage).ShouldNot(BeNil())
				g.Expect(version.Status.ContainerImages.ManilaAPIImage).ShouldNot(BeNil())
				g.Expect(version.Status.ContainerImages.ManilaSchedulerImage).ShouldNot(BeNil())
				g.Expect(version.Status.ContainerImages.MariadbImage).ShouldNot(BeNil())
				g.Expect(version.Status.ContainerImages.NetUtilsImage).ShouldNot(BeNil())
				g.Expect(version.Status.ContainerImages.NeutronAPIImage).ShouldNot(BeNil())
				g.Expect(version.Status.ContainerImages.NovaAPIImage).ShouldNot(BeNil())
				g.Expect(version.Status.ContainerImages.NovaComputeImage).ShouldNot(BeNil())
				g.Expect(version.Status.ContainerImages.NovaConductorImage).ShouldNot(BeNil())
				g.Expect(version.Status.ContainerImages.NovaNovncImage).ShouldNot(BeNil())
				g.Expect(version.Status.ContainerImages.NovaSchedulerImage).ShouldNot(BeNil())
				g.Expect(version.Status.ContainerImages.OctaviaApacheImage).ShouldNot(BeNil())
				g.Expect(version.Status.ContainerImages.OctaviaAPIImage).ShouldNot(BeNil())
				g.Expect(version.Status.ContainerImages.OctaviaHealthmanagerImage).ShouldNot(BeNil())
				g.Expect(version.Status.ContainerImages.OctaviaHousekeepingImage).ShouldNot(BeNil())
				g.Expect(version.Status.ContainerImages.OctaviaWorkerImage).ShouldNot(BeNil())
				g.Expect(version.Status.ContainerImages.OctaviaRsyslogImage).ShouldNot(BeNil())
				g.Expect(version.Status.ContainerImages.OpenstackClientImage).ShouldNot(BeNil())
				//fixme wire this one in
				//g.Expect(version.Status.ContainerImages.OsContainerImage).ShouldNot(BeNil())
				g.Expect(version.Status.ContainerImages.OvnControllerImage).ShouldNot(BeNil())
				g.Expect(version.Status.ContainerImages.OvnControllerOvsImage).ShouldNot(BeNil())
				g.Expect(version.Status.ContainerImages.OvnNbDbclusterImage).ShouldNot(BeNil())
				g.Expect(version.Status.ContainerImages.OvnNorthdImage).ShouldNot(BeNil())
				g.Expect(version.Status.ContainerImages.OvnSbDbclusterImage).ShouldNot(BeNil())
				g.Expect(version.Status.ContainerImages.PlacementAPIImage).ShouldNot(BeNil())
				g.Expect(version.Status.ContainerImages.RabbitmqImage).ShouldNot(BeNil())
				g.Expect(version.Status.ContainerImages.SwiftAccountImage).ShouldNot(BeNil())
				g.Expect(version.Status.ContainerImages.SwiftContainerImage).ShouldNot(BeNil())
				g.Expect(version.Status.ContainerImages.SwiftObjectImage).ShouldNot(BeNil())
				g.Expect(version.Status.ContainerImages.SwiftProxyImage).ShouldNot(BeNil())
				g.Expect(version.Status.ContainerImages.TestTempestImage).ShouldNot(BeNil())
				g.Expect(version.Status.ContainerImages.TestTobikoImage).ShouldNot(BeNil())
				g.Expect(version.Status.ContainerImages.TestHorizontestImage).ShouldNot(BeNil())
				g.Expect(version.Status.ContainerImages.TestAnsibletestImage).ShouldNot(BeNil())
				g.Expect(version.Status.ContainerImages.WatcherAPIImage).ShouldNot(BeNil())
				g.Expect(version.Status.ContainerImages.WatcherDecisionEngineImage).ShouldNot(BeNil())
				g.Expect(version.Status.ContainerImages.WatcherApplierImage).ShouldNot(BeNil())
			}, timeout, interval).Should(Succeed())
		})

	})

	// target version is *not* multiple OSVersion objects. Each time there is an update to a container image
	// a new targetVersion is "discovered". This test is meant to simulate that environment
	When("Multiple target versions exist", func() {

		initialVersion := "old"
		updatedVersion := "0.0.1"
		targetOvnControllerVersion := ""
		targetRabbitMQVersion := ""
		targetMariaDBVersion := ""
		targetMemcachedVersion := ""
		targetKeystoneAPIVersion := ""
		testOvnControllerImage := "foo/ovn:0.0.2"
		testRabbitMQImage := "foo/rabbit:0.0.2"
		testMariaDBImage := "foo/maria:0.0.2"
		testMemcachedImage := "foo/memcached:0.0.2"
		testKeystoneAPIImage := "foo/keystone:0.0.2"

		// a lightweight controlplane spec we'll use for minor update testing
		// we are missing some test helpers to simulate ready state so once we have
		// we can go back to a more complete controlplane spec
		BeforeEach(func() {

			// this is a very "lightweight" controlplane for minimal
			spec := GetDefaultOpenStackControlPlaneSpec()

			// a single galera database
			galeraTemplate := map[string]interface{}{
				names.DBName.Name: map[string]interface{}{
					"storageRequest": "500M",
				},
			}
			spec["galera"] = map[string]interface{}{
				"enabled":   true,
				"templates": galeraTemplate,
			}

			spec["horizon"] = map[string]interface{}{
				"enabled": false,
			}

			spec["glance"] = map[string]interface{}{
				"enabled": false,
			}
			spec["cinder"] = map[string]interface{}{
				"enabled": false,
			}
			spec["neutron"] = map[string]interface{}{
				"enabled": false,
			}
			spec["manila"] = map[string]interface{}{
				"enabled": false,
			}
			spec["heat"] = map[string]interface{}{
				"enabled": false,
			}
			spec["telemetry"] = map[string]interface{}{
				"enabled": false,
			}
			spec["tls"] = GetTLSPublicSpec()
			spec["ovn"] = map[string]interface{}{
				"enabled": true,
				"template": map[string]interface{}{
					"ovnDBCluster": map[string]interface{}{
						"ovndbcluster-nb": map[string]interface{}{
							"dbType": "NB",
						},
						"ovndbcluster-sb": map[string]interface{}{
							"dbType": "SB",
						},
					},
					"ovnController": map[string]interface{}{
						"nicMappings": map[string]interface{}{
							"datacentre": "ospbr",
						},
					},
				},
			}
			DeferCleanup(
				th.DeleteInstance,
				CreateOpenStackVersion(names.OpenStackVersionName, GetDefaultOpenStackVersionSpec()),
			)

			// create cert secrets for rabbitmq instances
			DeferCleanup(k8sClient.Delete, ctx, th.CreateCertSecret(names.RabbitMQCertName))
			DeferCleanup(k8sClient.Delete, ctx, th.CreateCertSecret(names.RabbitMQCell1CertName))

			// (mschuppert) create root CA secrets as there is no certmanager running.
			// it is not used, just to make sure reconcile proceeds and creates the ca-bundle.
			DeferCleanup(k8sClient.Delete, ctx, CreateCertSecret(names.RootCAPublicName))
			DeferCleanup(k8sClient.Delete, ctx, CreateCertSecret(names.RootCAInternalName))
			DeferCleanup(k8sClient.Delete, ctx, CreateCertSecret(names.RootCAOvnName))
			DeferCleanup(k8sClient.Delete, ctx, CreateCertSecret(names.RootCALibvirtName))
			// create cert secrets for galera instances
			DeferCleanup(k8sClient.Delete, ctx, th.CreateCertSecret(names.DBCertName))
			DeferCleanup(k8sClient.Delete, ctx, th.CreateCertSecret(names.DBCell1CertName))
			// create cert secrets for memcached instance
			DeferCleanup(k8sClient.Delete, ctx, th.CreateCertSecret(names.MemcachedCertName))
			// create cert secrets for ovn instance
			DeferCleanup(k8sClient.Delete, ctx, th.CreateCertSecret(names.OVNNorthdCertName))
			DeferCleanup(k8sClient.Delete, ctx, th.CreateCertSecret(names.OVNControllerCertName))

			// wait for initial version to be created (this gives us version 0.0.1)
			Eventually(func(g Gomega) {

				th.ExpectCondition(
					names.OpenStackVersionName,
					ConditionGetterFunc(OpenStackVersionConditionGetter),
					corev1.OpenStackVersionInitialized,
					k8s_corev1.ConditionTrue,
				)

				version := GetOpenStackVersion(names.OpenStackVersionName)
				// capture this here as we'll need it below (this one comes from RELATED_IMAGES in hack/export_related_images.sh)
				targetOvnControllerVersion = *version.Status.ContainerImages.OvnControllerImage
				targetRabbitMQVersion = *version.Status.ContainerImages.RabbitmqImage
				targetMariaDBVersion = *version.Status.ContainerImages.MariadbImage
				targetMemcachedVersion = *version.Status.ContainerImages.InfraMemcachedImage
				targetKeystoneAPIVersion = *version.Status.ContainerImages.KeystoneAPIImage
				g.Expect(version).Should(Not(BeNil()))

				g.Expect(*version.Status.AvailableVersion).Should(ContainSubstring("0.0.1"))
				g.Expect(version.Spec.TargetVersion).Should(ContainSubstring("0.0.1"))
				updatedVersion = *version.Status.AvailableVersion
			}, timeout, interval).Should(Succeed())

			// inject an "old" version
			Eventually(func(g Gomega) {
				version := GetOpenStackVersion(names.OpenStackVersionName)
				version.Status.ContainerImageVersionDefaults[initialVersion] = version.Status.ContainerImageVersionDefaults[updatedVersion]
				version.Status.ContainerImageVersionDefaults[initialVersion].OvnControllerImage = &testOvnControllerImage
				version.Status.ContainerImageVersionDefaults[initialVersion].RabbitmqImage = &testRabbitMQImage
				version.Status.ContainerImageVersionDefaults[initialVersion].MariadbImage = &testMariaDBImage
				version.Status.ContainerImageVersionDefaults[initialVersion].InfraMemcachedImage = &testMemcachedImage
				version.Status.ContainerImageVersionDefaults[initialVersion].KeystoneAPIImage = &testKeystoneAPIImage
				g.Expect(th.K8sClient.Status().Update(th.Ctx, version)).To(Succeed())

				th.Logger.Info("Version injected", "on", names.OpenStackVersionName)
			}, timeout, interval).Should(Succeed())

			Eventually(func(g Gomega) {
				version := GetOpenStackVersion(names.OpenStackVersionName)
				version.Spec.TargetVersion = initialVersion
				g.Expect(th.K8sClient.Update(th.Ctx, version)).To(Succeed())
			}, timeout, interval).Should(Succeed())

			Eventually(func(g Gomega) {

				osversion := GetOpenStackVersion(names.OpenStackVersionName)
				g.Expect(osversion).Should(Not(BeNil()))
				g.Expect(osversion.Generation).Should(Equal(osversion.Status.ObservedGeneration))

				th.ExpectCondition(
					names.OpenStackVersionName,
					ConditionGetterFunc(OpenStackVersionConditionGetter),
					corev1.OpenStackVersionInitialized,
					k8s_corev1.ConditionTrue,
				)

				g.Expect(*osversion.Status.AvailableVersion).Should(Equal(updatedVersion))
				g.Expect(osversion.Spec.TargetVersion).Should(Equal(initialVersion))
				g.Expect(osversion.Status.DeployedVersion).Should(BeNil())
				// but the images should stay the same as we haven't switched to it yet
				g.Expect(*osversion.Status.ContainerImages.OvnControllerImage).Should(Equal(testOvnControllerImage))
				g.Expect(*osversion.Status.ContainerImages.RabbitmqImage).Should(Equal(testRabbitMQImage))
				g.Expect(*osversion.Status.ContainerImages.MariadbImage).Should(Equal(testMariaDBImage))
				g.Expect(*osversion.Status.ContainerImages.InfraMemcachedImage).Should(Equal(testMemcachedImage))
				g.Expect(*osversion.Status.ContainerImages.KeystoneAPIImage).Should(Equal(testKeystoneAPIImage))

			}, timeout, interval).Should(Succeed())

			DeferCleanup(
				th.DeleteInstance,
				CreateOpenStackControlPlane(names.OpenStackControlplaneName, spec),
			)

			DeferCleanup(
				th.DeleteInstance,
				CreateDataplaneNodeSet(names.OpenStackVersionName, DefaultDataPlaneNoNodeSetSpec(false)),
			)

			dataplanenodeset := GetDataplaneNodeset(names.OpenStackVersionName)
			dataplanenodeset.Status.DeployedVersion = initialVersion
			Expect(th.K8sClient.Status().Update(th.Ctx, dataplanenodeset)).To(Succeed())

			th.CreateSecret(types.NamespacedName{Name: "openstack-config-secret", Namespace: namespace}, map[string][]byte{"secure.yaml": []byte("foo")})
			th.CreateConfigMap(types.NamespacedName{Name: "openstack-config", Namespace: namespace}, map[string]interface{}{"clouds.yaml": string("foo"), "OS_CLOUD": "default"})

			// verify that the controlplane deploys the old OVN controller image
			OSCtlplane := GetOpenStackControlPlane(names.OpenStackControlplaneName)
			Expect(OSCtlplane.Spec.Ovn.Enabled).Should(BeTrue())

			SimulateControlplaneReady()

			// verify that DeployedVersion is set on the OpenStackControlplane to the initialversion
			Eventually(func(g Gomega) {
				th.ExpectCondition(
					names.OpenStackControlplaneName,
					ConditionGetterFunc(OpenStackControlPlaneConditionGetter),
					condition.ReadyCondition,
					k8s_corev1.ConditionTrue,
				)
				OSCtlplane := GetOpenStackControlPlane(names.OpenStackControlplaneName)
				g.Expect(OSCtlplane.Status.DeployedVersion).Should(Equal(&initialVersion))

			}, timeout, interval).Should(Succeed())

			// verify DeployedVersion also gets set on the OpenStackVersion resource
			Eventually(func(g Gomega) {

				osversion := GetOpenStackVersion(names.OpenStackVersionName)
				g.Expect(osversion).Should(Not(BeNil()))
				g.Expect(osversion.Generation).Should(Equal(osversion.Status.ObservedGeneration))

				g.Expect(osversion.Status.DeployedVersion).Should(Equal(&initialVersion))

			}, timeout, interval).Should(Succeed())

		})

		// 1) bump the targetVersion to 0.0.1
		// 2) verify that the OVN controller image gets updated on the controlplane
		// 3) simulate the OVN controller image getting updated on the dataplane
		// 4) verify that the rest of the container images get updated on the controlplane
		// 5) simulate 1 more dataplanenodeset update to finish the minor update workflow
		It("updating targetVersion triggers a minor update workflow", Serial, func() {

			// Also create an empty dataplanenodeset with no nodes. This allows the test to
			// verify that the minor update workflow works even with dataplane nodesets
			// present that also happen to have no nodes
			dataplanenodesetSpec := DefaultDataPlaneNoNodeSetSpec(false)
			dataplanenodesetSpec["nodes"] = map[string]interface{}{}
			DeferCleanup(
				th.DeleteInstance,
				CreateDataplaneNodeSet(names.OpenStackDataplaneNodeSetNoNodesName, dataplanenodesetSpec),
			)

			// 1) switch to version 0.0.1, this triggers a minor update
			osversion := GetOpenStackVersion(names.OpenStackVersionName)

			// should have a condition which reflects an update is available
			th.ExpectCondition(
				names.OpenStackVersionName,
				ConditionGetterFunc(OpenStackVersionConditionGetter),
				corev1.OpenStackVersionMinorUpdateAvailable,
				k8s_corev1.ConditionTrue,
			)

			osversion.Spec.TargetVersion = updatedVersion
			Expect(k8sClient.Update(ctx, osversion)).Should(Succeed())

			// verify the OpenStackVersion gets re-initialized with 0.0.1 image for OVN
			Eventually(func(g Gomega) {

				osversion := GetOpenStackVersion(names.OpenStackVersionName)
				g.Expect(osversion).Should(Not(BeNil()))
				g.Expect(osversion.Generation).Should(Equal(osversion.Status.ObservedGeneration))

				th.ExpectCondition(
					names.OpenStackVersionName,
					ConditionGetterFunc(OpenStackVersionConditionGetter),
					corev1.OpenStackVersionInitialized,
					k8s_corev1.ConditionTrue,
				)

				g.Expect(*osversion.Status.AvailableVersion).Should(Equal(updatedVersion))
				g.Expect(osversion.Spec.TargetVersion).Should(Equal(updatedVersion))
				// the target OVN Controller, RabbitMQ, MariaDB and KeystoneAPI image should be set on the Version object
				g.Expect(*osversion.Status.ContainerImages.OvnControllerImage).Should(Equal(targetOvnControllerVersion))
				g.Expect(*osversion.Status.ContainerImages.RabbitmqImage).Should(Equal(targetRabbitMQVersion))
				g.Expect(*osversion.Status.ContainerImages.MariadbImage).Should(Equal(targetMariaDBVersion))
				g.Expect(*osversion.Status.ContainerImages.InfraMemcachedImage).Should(Equal(targetMemcachedVersion))
				g.Expect(*osversion.Status.ContainerImages.KeystoneAPIImage).Should(Equal(targetKeystoneAPIVersion))

			}, timeout, interval).Should(Succeed())

			// 2) now we check that the target OVN version gets set on the OVN Controller

			th.ExpectCondition(
				names.OpenStackVersionName,
				ConditionGetterFunc(OpenStackVersionConditionGetter),
				corev1.OpenStackVersionMinorUpdateOVNControlplane,
				k8s_corev1.ConditionFalse,
			)

			ovn.SimulateOVNControllerReady(names.OVNControllerName)

			Eventually(func(g Gomega) {
				th.ExpectCondition(
					names.OpenStackControlplaneName,
					ConditionGetterFunc(OpenStackControlPlaneConditionGetter),
					corev1.OpenStackControlPlaneOVNReadyCondition,
					k8s_corev1.ConditionTrue,
				)
				th.ExpectCondition(
					names.OpenStackControlplaneName,
					ConditionGetterFunc(OpenStackControlPlaneConditionGetter),
					condition.ReadyCondition,
					k8s_corev1.ConditionUnknown,
				)

				OSCtlplane := GetOpenStackControlPlane(names.OpenStackControlplaneName)
				// verify the image is set
				g.Expect(*OSCtlplane.Status.ContainerImages.OvnControllerImage).Should(Equal(targetOvnControllerVersion))

			}, timeout, interval).Should(Succeed())

			// verify that OpenStackVersion is in the correct state (control plane OVN got updated)
			Eventually(func(g Gomega) {

				osversion := GetOpenStackVersion(names.OpenStackVersionName)
				g.Expect(osversion).Should(Not(BeNil()))
				g.Expect(osversion.OwnerReferences).Should(HaveLen(1))
				th.ExpectCondition(
					names.OpenStackVersionName,
					ConditionGetterFunc(OpenStackVersionConditionGetter),
					corev1.OpenStackVersionMinorUpdateOVNControlplane,
					k8s_corev1.ConditionTrue,
				)

			}, timeout, interval).Should(Succeed())

			// 3) simulate the OVN controller image getting updated on the dataplane
			// NOTE: the real workflow here requires manual steps as well for now
			dataplanenodeset := GetDataplaneNodeset(names.OpenStackVersionName)
			dataplanenodeset.Status.ObservedGeneration = dataplanenodeset.Generation
			dataplanenodeset.Status.ContainerImages = make(map[string]string)
			dataplanenodeset.Status.ContainerImages["OvnControllerImage"] = targetOvnControllerVersion
			dataplanenodeset.Status.Conditions.MarkTrue(condition.ReadyCondition, dataplanev1.NodeSetReadyMessage)
			Expect(th.K8sClient.Status().Update(th.Ctx, dataplanenodeset)).To(Succeed())

			// Simulate the empty dataplanenodeset generation status as well
			dataplanenodeset = GetDataplaneNodeset(names.OpenStackDataplaneNodeSetNoNodesName)
			dataplanenodeset.Status.ObservedGeneration = dataplanenodeset.Generation
			Expect(th.K8sClient.Status().Update(th.Ctx, dataplanenodeset)).To(Succeed())

			// and now finally we verify that OpenStackVersion is in the correct state (data plane OVN got updated)
			Eventually(func(g Gomega) {

				osversion := GetOpenStackVersion(names.OpenStackVersionName)
				g.Expect(osversion).Should(Not(BeNil()))
				g.Expect(osversion.OwnerReferences).Should(HaveLen(1))
				th.ExpectCondition(
					names.OpenStackVersionName,
					ConditionGetterFunc(OpenStackVersionConditionGetter),
					corev1.OpenStackVersionMinorUpdateOVNDataplane,
					k8s_corev1.ConditionTrue,
				)

			}, timeout, interval).Should(Succeed())

			// 4a) RabbitMQ, first we wait for the condition to show up on the version resource
			th.ExpectCondition(
				names.OpenStackVersionName,
				ConditionGetterFunc(OpenStackVersionConditionGetter),
				corev1.OpenStackVersionMinorUpdateRabbitMQ,
				k8s_corev1.ConditionFalse,
			)

			SimulateRabbitmqReady()

			Eventually(func(g Gomega) {
				// verify the rabbitmq minor update condition is set on the openstackversion object
				th.ExpectCondition(
					names.OpenStackVersionName,
					ConditionGetterFunc(OpenStackVersionConditionGetter),
					corev1.OpenStackVersionMinorUpdateRabbitMQ,
					k8s_corev1.ConditionTrue,
				)

				OSCtlplane := GetOpenStackControlPlane(names.OpenStackControlplaneName)
				g.Expect(*OSCtlplane.Status.ContainerImages.RabbitmqImage).Should(Equal(targetRabbitMQVersion))

			}, timeout*4, interval).Should(Succeed())

			// 4b) Galera

			th.ExpectCondition(
				names.OpenStackVersionName,
				ConditionGetterFunc(OpenStackVersionConditionGetter),
				corev1.OpenStackVersionMinorUpdateMariaDB,
				k8s_corev1.ConditionFalse,
			)

			SimulateGalaraReady()
			Eventually(func(g Gomega) {
				th.ExpectCondition(
					names.OpenStackVersionName,
					ConditionGetterFunc(OpenStackVersionConditionGetter),
					corev1.OpenStackVersionMinorUpdateMariaDB,
					k8s_corev1.ConditionTrue,
				)
				OSCtlplane := GetOpenStackControlPlane(names.OpenStackControlplaneName)
				g.Expect(*OSCtlplane.Status.ContainerImages.MariadbImage).Should(Equal(targetMariaDBVersion))

			}, timeout, interval).Should(Succeed())

			// 4c) Memcached
			th.ExpectCondition(
				names.OpenStackVersionName,
				ConditionGetterFunc(OpenStackVersionConditionGetter),
				corev1.OpenStackVersionMinorUpdateMemcached,
				k8s_corev1.ConditionFalse,
			)

			SimulateMemcachedReady()

			Eventually(func(g Gomega) {
				th.ExpectCondition(
					names.OpenStackVersionName,
					ConditionGetterFunc(OpenStackVersionConditionGetter),
					corev1.OpenStackVersionMinorUpdateMemcached,
					k8s_corev1.ConditionTrue,
				)
				OSCtlplane := GetOpenStackControlPlane(names.OpenStackControlplaneName)
				g.Expect(*OSCtlplane.Status.ContainerImages.InfraMemcachedImage).Should(Equal(targetMemcachedVersion))

			}, timeout, interval).Should(Succeed())

			// 4d) Keystone

			th.ExpectCondition(
				names.OpenStackVersionName,
				ConditionGetterFunc(OpenStackVersionConditionGetter),
				corev1.OpenStackVersionMinorUpdateKeystone,
				k8s_corev1.ConditionFalse,
			)

			keystone.SimulateKeystoneAPIReady(names.KeystoneAPIName)
			Eventually(func(g Gomega) {
				th.ExpectCondition(
					names.OpenStackVersionName,
					ConditionGetterFunc(OpenStackVersionConditionGetter),
					corev1.OpenStackVersionMinorUpdateKeystone,
					k8s_corev1.ConditionTrue,
				)

				osversion := GetOpenStackVersion(names.OpenStackVersionName)
				OSCtlplane := GetOpenStackControlPlane(names.OpenStackControlplaneName)
				g.Expect(OSCtlplane.Status.ContainerImages.KeystoneAPIImage).Should(Equal(osversion.Status.ContainerImages.KeystoneAPIImage))

			}, timeout, interval).Should(Succeed())

			// 4d) verify that the rest of the container images get updated on the controlplane
			// this would occur automatically via the watch on the DataPlaneNodeSet's by openstackcontrolplane
			// so once the administrator executes the DataplaneDeployment and that finishes the controlplane will update the images immediately
			SimulateControlplaneReady()
			// now we check that the container images for the aforementioned services got updated
			Eventually(func(g Gomega) {
				th.ExpectCondition(
					names.OpenStackVersionName,
					ConditionGetterFunc(OpenStackVersionConditionGetter),
					corev1.OpenStackVersionMinorUpdateControlplane,
					k8s_corev1.ConditionTrue,
				)
				th.ExpectCondition(
					names.OpenStackControlplaneName,
					ConditionGetterFunc(OpenStackControlPlaneConditionGetter),
					condition.ReadyCondition,
					k8s_corev1.ConditionTrue,
				)

				osversion := GetOpenStackVersion(names.OpenStackVersionName)
				OSCtlplane := GetOpenStackControlPlane(names.OpenStackControlplaneName)
				// verify images match for deployed services on the controlplane
				g.Expect(OSCtlplane.Status.ContainerImages.RabbitmqImage).Should(Equal(osversion.Status.ContainerImages.RabbitmqImage))
				g.Expect(OSCtlplane.Status.ContainerImages.MariadbImage).Should(Equal(osversion.Status.ContainerImages.MariadbImage))
				g.Expect(OSCtlplane.Status.ContainerImages.KeystoneAPIImage).Should(Equal(osversion.Status.ContainerImages.KeystoneAPIImage))
				g.Expect(OSCtlplane.Status.ContainerImages.InfraMemcachedImage).Should(Equal(osversion.Status.ContainerImages.InfraMemcachedImage))
				g.Expect(OSCtlplane.Status.ContainerImages.OvnControllerImage).Should(Equal(osversion.Status.ContainerImages.OvnControllerImage))
				g.Expect(OSCtlplane.Status.ContainerImages.OvnControllerOvsImage).Should(Equal(osversion.Status.ContainerImages.OvnControllerOvsImage))
				g.Expect(OSCtlplane.Status.ContainerImages.OvnNbDbclusterImage).Should(Equal(osversion.Status.ContainerImages.OvnNbDbclusterImage))
				g.Expect(OSCtlplane.Status.ContainerImages.OvnNorthdImage).Should(Equal(osversion.Status.ContainerImages.OvnNorthdImage))
				g.Expect(OSCtlplane.Status.ContainerImages.OvnSbDbclusterImage).Should(Equal(osversion.Status.ContainerImages.OvnSbDbclusterImage))

			}, timeout, interval).Should(Succeed())

			// 5) simulate 1 more dataplanenodeset update to finish the minor update workflow
			// NOTE: the real workflow here requires manual intervention as well for now
			dataplanenodeset = GetDataplaneNodeset(names.OpenStackVersionName)
			dataplanenodeset.Status.ObservedGeneration = dataplanenodeset.Generation
			dataplanenodeset.Status.DeployedVersion = osversion.Spec.TargetVersion
			dataplanenodeset.Status.Conditions.MarkTrue(condition.ReadyCondition, dataplanev1.NodeSetReadyMessage)
			Expect(th.K8sClient.Status().Update(th.Ctx, dataplanenodeset)).To(Succeed())

			// and now finally we verify that OpenStackVersion is in the correct state (data plane conditions, etc)
			Eventually(func(g Gomega) {

				osversion := GetOpenStackVersion(names.OpenStackVersionName)
				g.Expect(osversion).Should(Not(BeNil()))
				g.Expect(osversion.OwnerReferences).Should(HaveLen(1))
				th.ExpectCondition(
					names.OpenStackVersionName,
					ConditionGetterFunc(OpenStackVersionConditionGetter),
					condition.ReadyCondition,
					k8s_corev1.ConditionTrue,
				)
				g.Expect(osversion.Status.DeployedVersion).Should(Equal(&updatedVersion)) // we're done here
				// no condition which reflects an update is available
				g.Expect(osversion.Status.Conditions.Has(corev1.OpenStackVersionMinorUpdateAvailable)).To(BeFalse())
			}, timeout, interval).Should(Succeed())

		})

	})

	// Test that minor updates don't hang when OVN is disabled
	When("Minor update with OVN disabled", func() {
		var (
			initialVersion           = "old"
			updatedVersion           = "0.0.1"
			targetRabbitMQVersion    = ""
			targetMariaDBVersion     = ""
			targetMemcachedVersion   = ""
			targetKeystoneAPIVersion = ""
			testRabbitMQImage        = "foo/rabbit:0.0.2"
			testMariaDBImage         = "foo/maria:0.0.2"
			testMemcachedImage       = "foo/memcached:0.0.2"
			testKeystoneAPIImage     = "foo/keystone:0.0.2"
		)

		BeforeEach(func() {
			// Lightweight controlplane spec with OVN DISABLED
			spec := GetDefaultOpenStackControlPlaneSpec()

			// a single galera database
			galeraTemplate := map[string]interface{}{
				names.DBName.Name: map[string]interface{}{
					"storageRequest": "500M",
				},
			}
			spec["galera"] = map[string]interface{}{
				"enabled":   true,
				"templates": galeraTemplate,
			}

			// Disable non-essential services
			spec["horizon"] = map[string]interface{}{"enabled": false}
			spec["glance"] = map[string]interface{}{"enabled": false}
			spec["cinder"] = map[string]interface{}{"enabled": false}
			spec["neutron"] = map[string]interface{}{"enabled": false}
			spec["manila"] = map[string]interface{}{"enabled": false}
			spec["heat"] = map[string]interface{}{"enabled": false}
			spec["telemetry"] = map[string]interface{}{"enabled": false}
			spec["tls"] = GetTLSPublicSpec()

			// CRITICAL: Disable OVN
			spec["ovn"] = map[string]interface{}{
				"enabled": false,
			}

			DeferCleanup(
				th.DeleteInstance,
				CreateOpenStackVersion(names.OpenStackVersionName, GetDefaultOpenStackVersionSpec()),
			)

			// create cert secrets for rabbitmq instances
			DeferCleanup(k8sClient.Delete, ctx, th.CreateCertSecret(names.RabbitMQCertName))
			DeferCleanup(k8sClient.Delete, ctx, th.CreateCertSecret(names.RabbitMQCell1CertName))

			// create root CA secrets
			DeferCleanup(k8sClient.Delete, ctx, CreateCertSecret(names.RootCAPublicName))
			DeferCleanup(k8sClient.Delete, ctx, CreateCertSecret(names.RootCAInternalName))
			DeferCleanup(k8sClient.Delete, ctx, CreateCertSecret(names.RootCAOvnName))
			DeferCleanup(k8sClient.Delete, ctx, CreateCertSecret(names.RootCALibvirtName))

			// create cert secrets for galera instances
			DeferCleanup(k8sClient.Delete, ctx, th.CreateCertSecret(names.DBCertName))
			DeferCleanup(k8sClient.Delete, ctx, th.CreateCertSecret(names.DBCell1CertName))

			// create cert secrets for memcached instance
			DeferCleanup(k8sClient.Delete, ctx, th.CreateCertSecret(names.MemcachedCertName))

			// wait for initial version to be created (this gives us version 0.0.1)
			Eventually(func(g Gomega) {
				th.ExpectCondition(
					names.OpenStackVersionName,
					ConditionGetterFunc(OpenStackVersionConditionGetter),
					corev1.OpenStackVersionInitialized,
					k8s_corev1.ConditionTrue,
				)

				version := GetOpenStackVersion(names.OpenStackVersionName)
				// capture target versions
				targetRabbitMQVersion = *version.Status.ContainerImages.RabbitmqImage
				targetMariaDBVersion = *version.Status.ContainerImages.MariadbImage
				targetMemcachedVersion = *version.Status.ContainerImages.InfraMemcachedImage
				targetKeystoneAPIVersion = *version.Status.ContainerImages.KeystoneAPIImage
				g.Expect(version).Should(Not(BeNil()))

				g.Expect(*version.Status.AvailableVersion).Should(ContainSubstring("0.0.1"))
				g.Expect(version.Spec.TargetVersion).Should(ContainSubstring("0.0.1"))
				updatedVersion = *version.Status.AvailableVersion
			}, timeout, interval).Should(Succeed())

			// inject an "old" version
			Eventually(func(g Gomega) {
				version := GetOpenStackVersion(names.OpenStackVersionName)
				version.Status.ContainerImageVersionDefaults[initialVersion] = version.Status.ContainerImageVersionDefaults[updatedVersion]
				version.Status.ContainerImageVersionDefaults[initialVersion].RabbitmqImage = &testRabbitMQImage
				version.Status.ContainerImageVersionDefaults[initialVersion].MariadbImage = &testMariaDBImage
				version.Status.ContainerImageVersionDefaults[initialVersion].InfraMemcachedImage = &testMemcachedImage
				version.Status.ContainerImageVersionDefaults[initialVersion].KeystoneAPIImage = &testKeystoneAPIImage
				g.Expect(th.K8sClient.Status().Update(th.Ctx, version)).To(Succeed())
			}, timeout, interval).Should(Succeed())

			Eventually(func(g Gomega) {
				version := GetOpenStackVersion(names.OpenStackVersionName)
				version.Spec.TargetVersion = initialVersion
				g.Expect(th.K8sClient.Update(th.Ctx, version)).To(Succeed())
			}, timeout, interval).Should(Succeed())

			Eventually(func(g Gomega) {
				osversion := GetOpenStackVersion(names.OpenStackVersionName)
				g.Expect(osversion).Should(Not(BeNil()))
				g.Expect(osversion.Generation).Should(Equal(osversion.Status.ObservedGeneration))

				th.ExpectCondition(
					names.OpenStackVersionName,
					ConditionGetterFunc(OpenStackVersionConditionGetter),
					corev1.OpenStackVersionInitialized,
					k8s_corev1.ConditionTrue,
				)

				g.Expect(*osversion.Status.AvailableVersion).Should(Equal(updatedVersion))
				g.Expect(osversion.Spec.TargetVersion).Should(Equal(initialVersion))
				g.Expect(osversion.Status.DeployedVersion).Should(BeNil())
			}, timeout, interval).Should(Succeed())

			DeferCleanup(
				th.DeleteInstance,
				CreateOpenStackControlPlane(names.OpenStackControlplaneName, spec),
			)

			DeferCleanup(
				th.DeleteInstance,
				CreateDataplaneNodeSet(names.OpenStackVersionName, DefaultDataPlaneNoNodeSetSpec(false)),
			)

			dataplanenodeset := GetDataplaneNodeset(names.OpenStackVersionName)
			dataplanenodeset.Status.DeployedVersion = initialVersion
			Expect(th.K8sClient.Status().Update(th.Ctx, dataplanenodeset)).To(Succeed())

			th.CreateSecret(types.NamespacedName{Name: "openstack-config-secret", Namespace: namespace}, map[string][]byte{"secure.yaml": []byte("foo")})
			th.CreateConfigMap(types.NamespacedName{Name: "openstack-config", Namespace: namespace}, map[string]interface{}{"clouds.yaml": string("foo"), "OS_CLOUD": "default"})

			// Verify OVN is disabled
			OSCtlplane := GetOpenStackControlPlane(names.OpenStackControlplaneName)
			Expect(OSCtlplane.Spec.Ovn.Enabled).Should(BeFalse())

			SimulateControlplaneReady()

			// verify that DeployedVersion is set
			Eventually(func(g Gomega) {
				th.ExpectCondition(
					names.OpenStackControlplaneName,
					ConditionGetterFunc(OpenStackControlPlaneConditionGetter),
					condition.ReadyCondition,
					k8s_corev1.ConditionTrue,
				)
				OSCtlplane := GetOpenStackControlPlane(names.OpenStackControlplaneName)
				g.Expect(OSCtlplane.Status.DeployedVersion).Should(Equal(&initialVersion))
			}, timeout, interval).Should(Succeed())

			// verify DeployedVersion also gets set on the OpenStackVersion resource
			Eventually(func(g Gomega) {
				osversion := GetOpenStackVersion(names.OpenStackVersionName)
				g.Expect(osversion).Should(Not(BeNil()))
				g.Expect(osversion.Generation).Should(Equal(osversion.Status.ObservedGeneration))
				g.Expect(osversion.Status.DeployedVersion).Should(Equal(&initialVersion))
			}, timeout, interval).Should(Succeed())
		})

		It("updating targetVersion should not hang on OVN checks", Serial, func() {
			// Trigger minor update by switching to updated version
			osversion := GetOpenStackVersion(names.OpenStackVersionName)

			// should have a condition which reflects an update is available
			th.ExpectCondition(
				names.OpenStackVersionName,
				ConditionGetterFunc(OpenStackVersionConditionGetter),
				corev1.OpenStackVersionMinorUpdateAvailable,
				k8s_corev1.ConditionTrue,
			)

			osversion.Spec.TargetVersion = updatedVersion
			Expect(k8sClient.Update(ctx, osversion)).Should(Succeed())

			// Verify the OpenStackVersion gets re-initialized with new version
			Eventually(func(g Gomega) {
				osversion := GetOpenStackVersion(names.OpenStackVersionName)
				g.Expect(osversion).Should(Not(BeNil()))
				g.Expect(osversion.Generation).Should(Equal(osversion.Status.ObservedGeneration))

				th.ExpectCondition(
					names.OpenStackVersionName,
					ConditionGetterFunc(OpenStackVersionConditionGetter),
					corev1.OpenStackVersionInitialized,
					k8s_corev1.ConditionTrue,
				)

				g.Expect(*osversion.Status.AvailableVersion).Should(Equal(updatedVersion))
				g.Expect(osversion.Spec.TargetVersion).Should(Equal(updatedVersion))
				// target images should be set
				g.Expect(*osversion.Status.ContainerImages.RabbitmqImage).Should(Equal(targetRabbitMQVersion))
				g.Expect(*osversion.Status.ContainerImages.MariadbImage).Should(Equal(targetMariaDBVersion))
				g.Expect(*osversion.Status.ContainerImages.InfraMemcachedImage).Should(Equal(targetMemcachedVersion))
				g.Expect(*osversion.Status.ContainerImages.KeystoneAPIImage).Should(Equal(targetKeystoneAPIVersion))
			}, timeout, interval).Should(Succeed())

			// CRITICAL: Verify that OVN controlplane update condition is immediately set to true (not hanging)
			// This is the key assertion that proves the bug is fixed
			Eventually(func(g Gomega) {
				osversion := GetOpenStackVersion(names.OpenStackVersionName)
				g.Expect(osversion).Should(Not(BeNil()))

				// The OVN update condition should be true because OVN is disabled
				th.ExpectCondition(
					names.OpenStackVersionName,
					ConditionGetterFunc(OpenStackVersionConditionGetter),
					corev1.OpenStackVersionMinorUpdateOVNControlplane,
					k8s_corev1.ConditionTrue,
				)
			}, timeout, interval).Should(Succeed())

			// Verify OVN dataplane update also proceeds
			Eventually(func(_ Gomega) {
				th.ExpectCondition(
					names.OpenStackVersionName,
					ConditionGetterFunc(OpenStackVersionConditionGetter),
					corev1.OpenStackVersionMinorUpdateOVNDataplane,
					k8s_corev1.ConditionTrue,
				)
			}, timeout, interval).Should(Succeed())

			// Continue with infrastructure services
			th.ExpectCondition(
				names.OpenStackVersionName,
				ConditionGetterFunc(OpenStackVersionConditionGetter),
				corev1.OpenStackVersionMinorUpdateRabbitMQ,
				k8s_corev1.ConditionFalse,
			)

			SimulateRabbitmqReady()
			Eventually(func(g Gomega) {
				th.ExpectCondition(
					names.OpenStackVersionName,
					ConditionGetterFunc(OpenStackVersionConditionGetter),
					corev1.OpenStackVersionMinorUpdateRabbitMQ,
					k8s_corev1.ConditionTrue,
				)

				OSCtlplane := GetOpenStackControlPlane(names.OpenStackControlplaneName)
				g.Expect(*OSCtlplane.Status.ContainerImages.RabbitmqImage).Should(Equal(targetRabbitMQVersion))
			}, timeout*4, interval).Should(Succeed())

			SimulateGalaraReady()
			Eventually(func(g Gomega) {
				th.ExpectCondition(
					names.OpenStackVersionName,
					ConditionGetterFunc(OpenStackVersionConditionGetter),
					corev1.OpenStackVersionMinorUpdateMariaDB,
					k8s_corev1.ConditionTrue,
				)
				OSCtlplane := GetOpenStackControlPlane(names.OpenStackControlplaneName)
				g.Expect(*OSCtlplane.Status.ContainerImages.MariadbImage).Should(Equal(targetMariaDBVersion))
			}, timeout, interval).Should(Succeed())

			SimulateMemcachedReady()
			Eventually(func(g Gomega) {
				th.ExpectCondition(
					names.OpenStackVersionName,
					ConditionGetterFunc(OpenStackVersionConditionGetter),
					corev1.OpenStackVersionMinorUpdateMemcached,
					k8s_corev1.ConditionTrue,
				)
				OSCtlplane := GetOpenStackControlPlane(names.OpenStackControlplaneName)
				g.Expect(*OSCtlplane.Status.ContainerImages.InfraMemcachedImage).Should(Equal(targetMemcachedVersion))
			}, timeout, interval).Should(Succeed())

			keystone.SimulateKeystoneAPIReady(names.KeystoneAPIName)
			Eventually(func(g Gomega) {
				th.ExpectCondition(
					names.OpenStackVersionName,
					ConditionGetterFunc(OpenStackVersionConditionGetter),
					corev1.OpenStackVersionMinorUpdateKeystone,
					k8s_corev1.ConditionTrue,
				)

				osversion := GetOpenStackVersion(names.OpenStackVersionName)
				OSCtlplane := GetOpenStackControlPlane(names.OpenStackControlplaneName)
				g.Expect(OSCtlplane.Status.ContainerImages.KeystoneAPIImage).Should(Equal(osversion.Status.ContainerImages.KeystoneAPIImage))
			}, timeout, interval).Should(Succeed())

			// Simulate controlplane ready
			SimulateControlplaneReady()
			Eventually(func(g Gomega) {
				th.ExpectCondition(
					names.OpenStackVersionName,
					ConditionGetterFunc(OpenStackVersionConditionGetter),
					corev1.OpenStackVersionMinorUpdateControlplane,
					k8s_corev1.ConditionTrue,
				)
				th.ExpectCondition(
					names.OpenStackControlplaneName,
					ConditionGetterFunc(OpenStackControlPlaneConditionGetter),
					condition.ReadyCondition,
					k8s_corev1.ConditionTrue,
				)

				osversion := GetOpenStackVersion(names.OpenStackVersionName)
				OSCtlplane := GetOpenStackControlPlane(names.OpenStackControlplaneName)
				// verify images match
				g.Expect(OSCtlplane.Status.ContainerImages.RabbitmqImage).Should(Equal(osversion.Status.ContainerImages.RabbitmqImage))
				g.Expect(OSCtlplane.Status.ContainerImages.MariadbImage).Should(Equal(osversion.Status.ContainerImages.MariadbImage))
				g.Expect(OSCtlplane.Status.ContainerImages.KeystoneAPIImage).Should(Equal(osversion.Status.ContainerImages.KeystoneAPIImage))
				g.Expect(OSCtlplane.Status.ContainerImages.InfraMemcachedImage).Should(Equal(osversion.Status.ContainerImages.InfraMemcachedImage))
			}, timeout, interval).Should(Succeed())

			// Simulate dataplane deployment complete
			dataplanenodeset := GetDataplaneNodeset(names.OpenStackVersionName)
			dataplanenodeset.Status.ObservedGeneration = dataplanenodeset.Generation
			dataplanenodeset.Status.DeployedVersion = osversion.Spec.TargetVersion
			dataplanenodeset.Status.Conditions.MarkTrue(condition.ReadyCondition, dataplanev1.NodeSetReadyMessage)
			Expect(th.K8sClient.Status().Update(th.Ctx, dataplanenodeset)).To(Succeed())

			// Verify minor update completes successfully
			Eventually(func(g Gomega) {
				osversion := GetOpenStackVersion(names.OpenStackVersionName)
				g.Expect(osversion).Should(Not(BeNil()))
				g.Expect(osversion.OwnerReferences).Should(HaveLen(1))
				th.ExpectCondition(
					names.OpenStackVersionName,
					ConditionGetterFunc(OpenStackVersionConditionGetter),
					condition.ReadyCondition,
					k8s_corev1.ConditionTrue,
				)
				g.Expect(osversion.Status.DeployedVersion).Should(Equal(&updatedVersion))
				// no condition which reflects an update is available
				g.Expect(osversion.Status.Conditions.Has(corev1.OpenStackVersionMinorUpdateAvailable)).To(BeFalse())
			}, timeout, interval).Should(Succeed())
		})

	})

	When("CustomContainerImages are set", func() {
		var (
			initialVersion = "0.0.1"
			updatedVersion = "0.0.2"
		)

		When("KeystoneAPI custom images", func() {
			var customKeystoneImage = "custom.registry/keystone:custom-tag"

			BeforeEach(func() {
				// Create OpenStackVersion with custom container images
				spec := GetDefaultOpenStackVersionSpec()
				spec["customContainerImages"] = map[string]interface{}{
					"keystoneAPIImage": customKeystoneImage,
				}

				DeferCleanup(
					th.DeleteInstance,
					CreateOpenStackVersion(names.OpenStackVersionName, spec),
				)

				// Wait for initial version to be created and initialized
				Eventually(func(g Gomega) {
					th.ExpectCondition(
						names.OpenStackVersionName,
						ConditionGetterFunc(OpenStackVersionConditionGetter),
						corev1.OpenStackVersionInitialized,
						k8s_corev1.ConditionTrue,
					)

					version := GetOpenStackVersion(names.OpenStackVersionName)
					g.Expect(version).Should(Not(BeNil()))
					g.Expect(*version.Status.AvailableVersion).Should(ContainSubstring(initialVersion))
					g.Expect(version.Spec.TargetVersion).Should(ContainSubstring(initialVersion))
				}, timeout, interval).Should(Succeed())

				// Inject a newer version for testing minor updates
				Eventually(func(g Gomega) {
					version := GetOpenStackVersion(names.OpenStackVersionName)
					// Create container defaults for the updated version
					if version.Status.ContainerImageVersionDefaults == nil {
						version.Status.ContainerImageVersionDefaults = make(map[string]*corev1.ContainerDefaults)
					}
					version.Status.ContainerImageVersionDefaults[updatedVersion] = &corev1.ContainerDefaults{
						ContainerTemplate: corev1.ContainerTemplate{
							KeystoneAPIImage: &customKeystoneImage,
						},
					}
					g.Expect(th.K8sClient.Status().Update(th.Ctx, version)).To(Succeed())
				}, timeout, interval).Should(Succeed())

				// Simulate deployment by setting DeployedVersion
				Eventually(func(g Gomega) {
					version := GetOpenStackVersion(names.OpenStackVersionName)
					version.Status.DeployedVersion = &initialVersion

					// Track the custom images for the initial version
					if version.Status.TrackedCustomImages == nil {
						version.Status.TrackedCustomImages = make(map[string]corev1.CustomContainerImages)
					}
					version.Status.TrackedCustomImages[initialVersion] = corev1.CustomContainerImages{
						ContainerTemplate: corev1.ContainerTemplate{
							KeystoneAPIImage: &customKeystoneImage,
						},
					}

					g.Expect(th.K8sClient.Status().Update(th.Ctx, version)).To(Succeed())
				}, timeout, interval).Should(Succeed())

				// Remove finalizer as needed for cleanup
				DeferCleanup(
					OpenStackVersionRemoveFinalizer,
					ctx,
					names.OpenStackVersionName,
				)
			})

			It("should prevent targetVersion modification when CustomContainerImages are unchanged", func() {
				// Attempt to update targetVersion without changing CustomContainerImages
				// This should be rejected by the webhook validation
				Eventually(func(g Gomega) {
					version := GetOpenStackVersion(names.OpenStackVersionName)

					// Try to update to the new version without changing custom images
					version.Spec.TargetVersion = updatedVersion
					// Keep the same custom container images (this should trigger validation error)
					version.Spec.CustomContainerImages = corev1.CustomContainerImages{
						ContainerTemplate: corev1.ContainerTemplate{
							KeystoneAPIImage: &customKeystoneImage,
						},
					}

					err := k8sClient.Update(ctx, version)
					g.Expect(err).Should(HaveOccurred())
					g.Expect(err.Error()).Should(ContainSubstring("CustomContainerImages must be updated when changing targetVersion"))
					g.Expect(err.Error()).Should(ContainSubstring("prevents proper version tracking and validation"))
				}, timeout, interval).Should(Succeed())
			})

			It("should allow targetVersion modification when CustomContainerImages are updated", func() {
				// Update CustomContainerImages along with targetVersion
				newCustomKeystoneImage := "custom.registry/keystone:new-custom-tag"

				// Use Eventually to handle potential conflicts from controller updates
				Eventually(func(g Gomega) {
					version := GetOpenStackVersion(names.OpenStackVersionName)
					version.Spec.TargetVersion = updatedVersion
					// Update the custom container images (this should be allowed)
					version.Spec.CustomContainerImages = corev1.CustomContainerImages{
						ContainerTemplate: corev1.ContainerTemplate{
							KeystoneAPIImage: &newCustomKeystoneImage,
						},
					}

					g.Expect(k8sClient.Update(ctx, version)).To(Succeed())
				}, timeout, interval).Should(Succeed())

				// Verify the update was successful
				Eventually(func(g Gomega) {
					updatedVersionObj := GetOpenStackVersion(names.OpenStackVersionName)
					g.Expect(updatedVersionObj.Spec.TargetVersion).Should(Equal(updatedVersion))
					g.Expect(*updatedVersionObj.Spec.CustomContainerImages.KeystoneAPIImage).Should(Equal(newCustomKeystoneImage))
				}, timeout, interval).Should(Succeed())
			})

			It("should allow targetVersion modification when no CustomContainerImages are set", func() {
				// First, remove custom container images
				Eventually(func(g Gomega) {
					version := GetOpenStackVersion(names.OpenStackVersionName)
					version.Spec.CustomContainerImages = corev1.CustomContainerImages{}
					g.Expect(k8sClient.Update(ctx, version)).To(Succeed())
				}, timeout, interval).Should(Succeed())

				// Now update targetVersion (this should be allowed since no custom images)
				Eventually(func(g Gomega) {
					version := GetOpenStackVersion(names.OpenStackVersionName)
					version.Spec.TargetVersion = updatedVersion
					g.Expect(k8sClient.Update(ctx, version)).To(Succeed())
				}, timeout, interval).Should(Succeed())

				// Verify the update was successful
				Eventually(func(g Gomega) {
					versionObj := GetOpenStackVersion(names.OpenStackVersionName)
					g.Expect(versionObj.Spec.TargetVersion).Should(Equal(updatedVersion))
				}, timeout, interval).Should(Succeed())
			})
		})

		When("CinderVolume custom images", func() {
			var customCinderVolumeImage = "custom.registry/cinder-volume:custom-tag"

			BeforeEach(func() {
				// Create OpenStackVersion with custom CinderVolumeImages
				spec := GetDefaultOpenStackVersionSpec()
				spec["customContainerImages"] = map[string]interface{}{
					"cinderVolumeImages": map[string]string{
						"backend1": customCinderVolumeImage,
					},
				}

				DeferCleanup(
					th.DeleteInstance,
					CreateOpenStackVersion(names.OpenStackVersionName, spec),
				)

				// Wait for initial version to be created and initialized
				Eventually(func(g Gomega) {
					th.ExpectCondition(
						names.OpenStackVersionName,
						ConditionGetterFunc(OpenStackVersionConditionGetter),
						corev1.OpenStackVersionInitialized,
						k8s_corev1.ConditionTrue,
					)

					version := GetOpenStackVersion(names.OpenStackVersionName)
					g.Expect(version).Should(Not(BeNil()))
					g.Expect(*version.Status.AvailableVersion).Should(ContainSubstring(initialVersion))
					g.Expect(version.Spec.TargetVersion).Should(ContainSubstring(initialVersion))
				}, timeout, interval).Should(Succeed())

				// Inject a newer version for testing minor updates
				Eventually(func(g Gomega) {
					version := GetOpenStackVersion(names.OpenStackVersionName)
					// Create container defaults for the updated version
					if version.Status.ContainerImageVersionDefaults == nil {
						version.Status.ContainerImageVersionDefaults = make(map[string]*corev1.ContainerDefaults)
					}
					version.Status.ContainerImageVersionDefaults[updatedVersion] = &corev1.ContainerDefaults{}
					g.Expect(th.K8sClient.Status().Update(th.Ctx, version)).To(Succeed())
				}, timeout, interval).Should(Succeed())

				// Simulate deployment by setting DeployedVersion
				Eventually(func(g Gomega) {
					version := GetOpenStackVersion(names.OpenStackVersionName)
					version.Status.DeployedVersion = &initialVersion

					// Track the custom images for the initial version
					if version.Status.TrackedCustomImages == nil {
						version.Status.TrackedCustomImages = make(map[string]corev1.CustomContainerImages)
					}
					version.Status.TrackedCustomImages[initialVersion] = corev1.CustomContainerImages{
						CinderVolumeImages: map[string]*string{
							"backend1": &customCinderVolumeImage,
						},
					}

					g.Expect(th.K8sClient.Status().Update(th.Ctx, version)).To(Succeed())
				}, timeout, interval).Should(Succeed())

				// Remove finalizer as needed for cleanup
				DeferCleanup(
					OpenStackVersionRemoveFinalizer,
					ctx,
					names.OpenStackVersionName,
				)
			})

			It("should prevent targetVersion modification when CinderVolumeImages are unchanged", func() {
				// Attempt to update targetVersion without changing CinderVolumeImages
				Eventually(func(g Gomega) {
					version := GetOpenStackVersion(names.OpenStackVersionName)
					version.Spec.TargetVersion = updatedVersion
					// Keep the same CinderVolumeImages (this should trigger validation error)
					version.Spec.CustomContainerImages = corev1.CustomContainerImages{
						CinderVolumeImages: map[string]*string{
							"backend1": &customCinderVolumeImage,
						},
					}

					err := k8sClient.Update(ctx, version)
					if err != nil && strings.Contains(err.Error(), "the object has been modified") {
						// Retry on conflict errors
						return
					}
					g.Expect(err).Should(HaveOccurred())
					g.Expect(err.Error()).Should(ContainSubstring("CustomContainerImages must be updated when changing targetVersion"))
				}, timeout, interval).Should(Succeed())
			})

			It("should allow targetVersion modification when CinderVolumeImages are updated", func() {
				newCustomCinderVolumeImage := "custom.registry/cinder-volume:new-custom-tag"

				// Update CinderVolumeImages along with targetVersion
				Eventually(func(g Gomega) {
					version := GetOpenStackVersion(names.OpenStackVersionName)
					version.Spec.TargetVersion = updatedVersion
					// Update the CinderVolumeImages (this should be allowed)
					version.Spec.CustomContainerImages = corev1.CustomContainerImages{
						CinderVolumeImages: map[string]*string{
							"backend1": &newCustomCinderVolumeImage,
						},
					}
					g.Expect(k8sClient.Update(ctx, version)).To(Succeed())
				}, timeout, interval).Should(Succeed())

				// Verify the update was successful
				Eventually(func(g Gomega) {
					updatedVersionObj := GetOpenStackVersion(names.OpenStackVersionName)
					g.Expect(updatedVersionObj.Spec.TargetVersion).Should(Equal(updatedVersion))
					g.Expect(*updatedVersionObj.Spec.CustomContainerImages.CinderVolumeImages["backend1"]).Should(Equal(newCustomCinderVolumeImage))
				}, timeout, interval).Should(Succeed())
			})
		})

		When("ManilaShare custom images", func() {
			var customManilaShareImage = "custom.registry/manila-share:custom-tag"

			BeforeEach(func() {
				// Create OpenStackVersion with custom ManilaShareImages
				spec := GetDefaultOpenStackVersionSpec()
				spec["customContainerImages"] = map[string]interface{}{
					"manilaShareImages": map[string]string{
						"share-backend1": customManilaShareImage,
					},
				}

				DeferCleanup(
					th.DeleteInstance,
					CreateOpenStackVersion(names.OpenStackVersionName, spec),
				)

				// Wait for initial version to be created and initialized
				Eventually(func(g Gomega) {
					th.ExpectCondition(
						names.OpenStackVersionName,
						ConditionGetterFunc(OpenStackVersionConditionGetter),
						corev1.OpenStackVersionInitialized,
						k8s_corev1.ConditionTrue,
					)

					version := GetOpenStackVersion(names.OpenStackVersionName)
					g.Expect(version).Should(Not(BeNil()))
					g.Expect(*version.Status.AvailableVersion).Should(ContainSubstring(initialVersion))
					g.Expect(version.Spec.TargetVersion).Should(ContainSubstring(initialVersion))
				}, timeout, interval).Should(Succeed())

				// Inject a newer version for testing minor updates
				Eventually(func(g Gomega) {
					version := GetOpenStackVersion(names.OpenStackVersionName)
					// Create container defaults for the updated version
					if version.Status.ContainerImageVersionDefaults == nil {
						version.Status.ContainerImageVersionDefaults = make(map[string]*corev1.ContainerDefaults)
					}
					version.Status.ContainerImageVersionDefaults[updatedVersion] = &corev1.ContainerDefaults{}
					g.Expect(th.K8sClient.Status().Update(th.Ctx, version)).To(Succeed())
				}, timeout, interval).Should(Succeed())

				// Simulate deployment by setting DeployedVersion
				Eventually(func(g Gomega) {
					version := GetOpenStackVersion(names.OpenStackVersionName)
					version.Status.DeployedVersion = &initialVersion

					// Track the custom images for the initial version
					if version.Status.TrackedCustomImages == nil {
						version.Status.TrackedCustomImages = make(map[string]corev1.CustomContainerImages)
					}
					version.Status.TrackedCustomImages[initialVersion] = corev1.CustomContainerImages{
						ManilaShareImages: map[string]*string{
							"share-backend1": &customManilaShareImage,
						},
					}

					g.Expect(th.K8sClient.Status().Update(th.Ctx, version)).To(Succeed())
				}, timeout, interval).Should(Succeed())

				// Remove finalizer as needed for cleanup
				DeferCleanup(
					OpenStackVersionRemoveFinalizer,
					ctx,
					names.OpenStackVersionName,
				)
			})

			It("should prevent targetVersion modification when ManilaShareImages are unchanged", func() {
				// Attempt to update targetVersion without changing ManilaShareImages
				Eventually(func(g Gomega) {
					version := GetOpenStackVersion(names.OpenStackVersionName)
					version.Spec.TargetVersion = updatedVersion
					// Keep the same ManilaShareImages (this should trigger validation error)
					version.Spec.CustomContainerImages = corev1.CustomContainerImages{
						ManilaShareImages: map[string]*string{
							"share-backend1": &customManilaShareImage,
						},
					}

					err := k8sClient.Update(ctx, version)
					if err != nil && strings.Contains(err.Error(), "the object has been modified") {
						// Retry on conflict errors
						return
					}
					g.Expect(err).Should(HaveOccurred())
					g.Expect(err.Error()).Should(ContainSubstring("CustomContainerImages must be updated when changing targetVersion"))
					g.Expect(err.Error()).Should(ContainSubstring("prevents proper version tracking and validation"))
				}, timeout, interval).Should(Succeed())
			})

			It("should allow targetVersion modification when ManilaShareImages are updated", func() {
				newCustomManilaShareImage := "custom.registry/manila-share:new-custom-tag"

				// Update ManilaShareImages along with targetVersion
				Eventually(func(g Gomega) {
					version := GetOpenStackVersion(names.OpenStackVersionName)
					version.Spec.TargetVersion = updatedVersion
					// Update the ManilaShareImages (this should be allowed)
					version.Spec.CustomContainerImages = corev1.CustomContainerImages{
						ManilaShareImages: map[string]*string{
							"share-backend1": &newCustomManilaShareImage,
						},
					}
					g.Expect(k8sClient.Update(ctx, version)).To(Succeed())
				}, timeout, interval).Should(Succeed())

				// Verify the update was successful
				Eventually(func(g Gomega) {
					updatedVersionObj := GetOpenStackVersion(names.OpenStackVersionName)
					g.Expect(updatedVersionObj.Spec.TargetVersion).Should(Equal(updatedVersion))
					g.Expect(*updatedVersionObj.Spec.CustomContainerImages.ManilaShareImages["share-backend1"]).Should(Equal(newCustomManilaShareImage))
				}, timeout, interval).Should(Succeed())
			})
		})

		When("skip-custom-images-validation annotation", func() {
			var customKeystoneImage = "custom.registry/keystone:custom-tag"

			BeforeEach(func() {
				// Create OpenStackVersion with custom container images
				spec := GetDefaultOpenStackVersionSpec()
				spec["customContainerImages"] = map[string]interface{}{
					"keystoneAPIImage": customKeystoneImage,
				}

				DeferCleanup(
					th.DeleteInstance,
					CreateOpenStackVersion(names.OpenStackVersionName, spec),
				)

				// Wait for initial version to be created and initialized
				Eventually(func(g Gomega) {
					th.ExpectCondition(
						names.OpenStackVersionName,
						ConditionGetterFunc(OpenStackVersionConditionGetter),
						corev1.OpenStackVersionInitialized,
						k8s_corev1.ConditionTrue,
					)

					version := GetOpenStackVersion(names.OpenStackVersionName)
					g.Expect(version).Should(Not(BeNil()))
					g.Expect(*version.Status.AvailableVersion).Should(ContainSubstring(initialVersion))
					g.Expect(version.Spec.TargetVersion).Should(ContainSubstring(initialVersion))
				}, timeout, interval).Should(Succeed())

				// Inject a newer version for testing minor updates
				Eventually(func(g Gomega) {
					version := GetOpenStackVersion(names.OpenStackVersionName)
					// Create container defaults for the updated version
					if version.Status.ContainerImageVersionDefaults == nil {
						version.Status.ContainerImageVersionDefaults = make(map[string]*corev1.ContainerDefaults)
					}
					version.Status.ContainerImageVersionDefaults[updatedVersion] = &corev1.ContainerDefaults{
						ContainerTemplate: corev1.ContainerTemplate{
							KeystoneAPIImage: &customKeystoneImage,
						},
					}
					g.Expect(th.K8sClient.Status().Update(th.Ctx, version)).To(Succeed())
				}, timeout, interval).Should(Succeed())

				// Simulate deployment by setting DeployedVersion
				Eventually(func(g Gomega) {
					version := GetOpenStackVersion(names.OpenStackVersionName)
					version.Status.DeployedVersion = &initialVersion

					// Track the custom images for the initial version
					if version.Status.TrackedCustomImages == nil {
						version.Status.TrackedCustomImages = make(map[string]corev1.CustomContainerImages)
					}
					version.Status.TrackedCustomImages[initialVersion] = corev1.CustomContainerImages{
						ContainerTemplate: corev1.ContainerTemplate{
							KeystoneAPIImage: &customKeystoneImage,
						},
					}

					g.Expect(th.K8sClient.Status().Update(th.Ctx, version)).To(Succeed())
				}, timeout, interval).Should(Succeed())

				// Remove finalizer as needed for cleanup
				DeferCleanup(
					OpenStackVersionRemoveFinalizer,
					ctx,
					names.OpenStackVersionName,
				)
			})

			It("should allow targetVersion modification with skip annotation when CustomContainerImages are unchanged", func() {
				// Update targetVersion with skip annotation, keeping same custom images
				Eventually(func(g Gomega) {
					version := GetOpenStackVersion(names.OpenStackVersionName)

					// Add the skip annotation
					if version.Annotations == nil {
						version.Annotations = make(map[string]string)
					}
					version.Annotations["core.openstack.org/skip-custom-images-validation"] = "true"

					version.Spec.TargetVersion = updatedVersion
					// Keep the same custom container images (should be allowed with annotation)
					version.Spec.CustomContainerImages = corev1.CustomContainerImages{
						ContainerTemplate: corev1.ContainerTemplate{
							KeystoneAPIImage: &customKeystoneImage,
						},
					}

					g.Expect(k8sClient.Update(ctx, version)).To(Succeed())
				}, timeout, interval).Should(Succeed())

				// Verify the update was successful
				Eventually(func(g Gomega) {
					updatedVersionObj := GetOpenStackVersion(names.OpenStackVersionName)
					g.Expect(updatedVersionObj.Spec.TargetVersion).Should(Equal(updatedVersion))
					g.Expect(*updatedVersionObj.Spec.CustomContainerImages.KeystoneAPIImage).Should(Equal(customKeystoneImage))
					g.Expect(updatedVersionObj.Annotations["core.openstack.org/skip-custom-images-validation"]).Should(Equal("true"))
				}, timeout, interval).Should(Succeed())
			})

			It("should allow targetVersion modification with skip annotation set to empty value", func() {
				// Update targetVersion with skip annotation set to empty string
				Eventually(func(g Gomega) {
					version := GetOpenStackVersion(names.OpenStackVersionName)

					// Add the skip annotation with empty value
					if version.Annotations == nil {
						version.Annotations = make(map[string]string)
					}
					version.Annotations["core.openstack.org/skip-custom-images-validation"] = ""

					version.Spec.TargetVersion = updatedVersion
					// Keep the same custom container images (should be allowed with annotation)
					version.Spec.CustomContainerImages = corev1.CustomContainerImages{
						ContainerTemplate: corev1.ContainerTemplate{
							KeystoneAPIImage: &customKeystoneImage,
						},
					}

					g.Expect(k8sClient.Update(ctx, version)).To(Succeed())
				}, timeout, interval).Should(Succeed())

				// Verify the update was successful
				Eventually(func(g Gomega) {
					updatedVersionObj := GetOpenStackVersion(names.OpenStackVersionName)
					g.Expect(updatedVersionObj.Spec.TargetVersion).Should(Equal(updatedVersion))
					g.Expect(*updatedVersionObj.Spec.CustomContainerImages.KeystoneAPIImage).Should(Equal(customKeystoneImage))
					g.Expect(updatedVersionObj.Annotations["core.openstack.org/skip-custom-images-validation"]).Should(Equal(""))
				}, timeout, interval).Should(Succeed())
			})

			It("should prevent targetVersion modification without skip annotation when CustomContainerImages are unchanged", func() {
				// Attempt to update targetVersion without skip annotation and unchanged custom images
				Eventually(func(g Gomega) {
					version := GetOpenStackVersion(names.OpenStackVersionName)

					// Ensure no skip annotation
					if version.Annotations != nil {
						delete(version.Annotations, "core.openstack.org/skip-custom-images-validation")
					}

					version.Spec.TargetVersion = updatedVersion
					// Keep the same custom container images (should be rejected without annotation)
					version.Spec.CustomContainerImages = corev1.CustomContainerImages{
						ContainerTemplate: corev1.ContainerTemplate{
							KeystoneAPIImage: &customKeystoneImage,
						},
					}

					err := k8sClient.Update(ctx, version)
					if err != nil && strings.Contains(err.Error(), "the object has been modified") {
						// Retry on conflict errors
						return
					}
					g.Expect(err).Should(HaveOccurred())
					g.Expect(err.Error()).Should(ContainSubstring("CustomContainerImages must be updated when changing targetVersion"))
					g.Expect(err.Error()).Should(ContainSubstring("prevents proper version tracking and validation"))
				}, timeout, interval).Should(Succeed())
			})
		})
	})

})