@@ -27,6 +27,8 @@ import (
2727 "github.com/openstack-k8s-operators/lib-common/modules/common/condition"
2828 . "github.com/openstack-k8s-operators/lib-common/modules/common/test/helpers"
2929
30+ memcachedv1 "github.com/openstack-k8s-operators/infra-operator/apis/memcached/v1beta1"
31+ rabbitmqv1 "github.com/openstack-k8s-operators/infra-operator/apis/rabbitmq/v1beta1"
3032 corev1 "github.com/openstack-k8s-operators/openstack-operator/api/core/v1beta1"
3133 dataplanev1 "github.com/openstack-k8s-operators/openstack-operator/api/dataplane/v1beta1"
3234 ovnv1 "github.com/openstack-k8s-operators/ovn-operator/api/v1beta1"
@@ -55,6 +57,41 @@ func expectCurrentTargetCustomImagesTracked(name types.NamespacedName) {
5557 }, timeout , interval ).Should (Succeed ())
5658}
5759
60+ func waitForRabbitMQImages (expectedImage string ) {
61+ Eventually (func (g Gomega ) {
62+ controlPlane := GetOpenStackControlPlane (names .OpenStackControlplaneName )
63+ g .Expect (controlPlane .Spec .Rabbitmq .Enabled ).To (BeTrue ())
64+ g .Expect (controlPlane .Spec .Rabbitmq .Templates ).NotTo (BeNil ())
65+ if controlPlane .Spec .Rabbitmq .Templates == nil {
66+ return
67+ }
68+ g .Expect (* controlPlane .Spec .Rabbitmq .Templates ).NotTo (BeEmpty ())
69+ for rabbitMQName := range * controlPlane .Spec .Rabbitmq .Templates {
70+ rabbitMQ := & rabbitmqv1.RabbitMq {}
71+ name := types.NamespacedName {Namespace : names .Namespace , Name : rabbitMQName }
72+ g .Expect (k8sClient .Get (ctx , name , rabbitMQ )).To (Succeed ())
73+ g .Expect (rabbitMQ .Spec .ContainerImage ).To (Equal (expectedImage ))
74+ }
75+ }, timeout , interval ).Should (Succeed ())
76+ }
77+
78+ func waitForMemcachedImage (expectedImage string ) {
79+ Eventually (func (g Gomega ) {
80+ memcached := & memcachedv1.Memcached {}
81+ g .Expect (k8sClient .Get (ctx , names .MemcachedName , memcached )).To (Succeed ())
82+ g .Expect (memcached .Spec .ContainerImage ).To (Equal (expectedImage ))
83+ }, timeout , interval ).Should (Succeed ())
84+ }
85+
86+ func waitForOVNControllerImages (name types.NamespacedName , ovnImage string , ovsImage string ) {
87+ Eventually (func (g Gomega ) {
88+ ovnController := & ovnv1.OVNController {}
89+ g .Expect (k8sClient .Get (ctx , name , ovnController )).To (Succeed ())
90+ g .Expect (ovnController .Spec .OvnContainerImage ).To (Equal (ovnImage ))
91+ g .Expect (ovnController .Spec .OvsContainerImage ).To (Equal (ovsImage ))
92+ }, timeout , interval ).Should (Succeed ())
93+ }
94+
5895var _ = Describe ("OpenStackVersion controller" , func () {
5996 BeforeEach (func () {
6097 // lib-common uses OPERATOR_TEMPLATES env var to locate the "templates"
@@ -223,6 +260,7 @@ var _ = Describe("OpenStackVersion controller", func() {
223260 initialVersion := "old"
224261 updatedVersion := "0.0.1"
225262 targetOvnControllerVersion := ""
263+ targetOvnControllerOvsVersion := ""
226264 targetRabbitMQVersion := ""
227265 targetMariaDBVersion := ""
228266 targetMemcachedVersion := ""
@@ -331,6 +369,7 @@ var _ = Describe("OpenStackVersion controller", func() {
331369 version := GetOpenStackVersion (names .OpenStackVersionName )
332370 // capture this here as we'll need it below (this one comes from RELATED_IMAGES in hack/export_related_images.sh)
333371 targetOvnControllerVersion = * version .Status .ContainerImages .OvnControllerImage
372+ targetOvnControllerOvsVersion = * version .Status .ContainerImages .OvnControllerOvsImage
334373 targetRabbitMQVersion = * version .Status .ContainerImages .RabbitmqImage
335374 targetMariaDBVersion = * version .Status .ContainerImages .MariadbImage
336375 targetMemcachedVersion = * version .Status .ContainerImages .InfraMemcachedImage
@@ -518,6 +557,11 @@ var _ = Describe("OpenStackVersion controller", func() {
518557 k8s_corev1 .ConditionFalse ,
519558 )
520559
560+ waitForOVNControllerImages (
561+ names .OVNControllerName ,
562+ targetOvnControllerVersion ,
563+ targetOvnControllerOvsVersion ,
564+ )
521565 ovn .SimulateOVNControllerReady (names .OVNControllerName )
522566
523567 Eventually (func (g Gomega ) {
@@ -592,6 +636,7 @@ var _ = Describe("OpenStackVersion controller", func() {
592636 k8s_corev1 .ConditionFalse ,
593637 )
594638
639+ waitForRabbitMQImages (targetRabbitMQVersion )
595640 SimulateRabbitmqReady ()
596641
597642 Eventually (func (g Gomega ) {
@@ -646,6 +691,7 @@ var _ = Describe("OpenStackVersion controller", func() {
646691 k8s_corev1 .ConditionFalse ,
647692 )
648693
694+ waitForMemcachedImage (targetMemcachedVersion )
649695 SimulateMemcachedReady ()
650696
651697 Eventually (func (g Gomega ) {
@@ -992,6 +1038,7 @@ var _ = Describe("OpenStackVersion controller", func() {
9921038 k8s_corev1 .ConditionFalse ,
9931039 )
9941040
1041+ waitForRabbitMQImages (targetRabbitMQVersion )
9951042 SimulateRabbitmqReady ()
9961043 Eventually (func (g Gomega ) {
9971044 th .ExpectCondition (
@@ -1025,6 +1072,7 @@ var _ = Describe("OpenStackVersion controller", func() {
10251072 g .Expect (* OSCtlplane .Status .ContainerImages .MariadbImage ).Should (Equal (targetMariaDBVersion ))
10261073 }, timeout , interval ).Should (Succeed ())
10271074
1075+ waitForMemcachedImage (targetMemcachedVersion )
10281076 SimulateMemcachedReady ()
10291077 Eventually (func (g Gomega ) {
10301078 th .ExpectCondition (
@@ -1914,6 +1962,9 @@ var _ = Describe("OpenStackVersion controller", func() {
19141962 )
19151963 }, timeout , interval ).Should (Succeed ())
19161964
1965+ version := GetOpenStackVersion (names .OpenStackVersionName )
1966+ Expect (version .Status .ContainerImages .RabbitmqImage ).NotTo (BeNil ())
1967+ waitForRabbitMQImages (* version .Status .ContainerImages .RabbitmqImage )
19171968 SimulateRabbitmqReady ()
19181969
19191970 Eventually (func (_ Gomega ) {
0 commit comments