Skip to content

Commit 87153e3

Browse files
committed
set defaultrabbimqversion to 3.9 until we have the rpms
1 parent 9be78b8 commit 87153e3

2 files changed

Lines changed: 10 additions & 6 deletions

File tree

internal/controller/rabbitmq/rabbitmq_controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ const (
116116
const (
117117
// DefaultRabbitMQVersion is the default RabbitMQ version when the target-version annotation is not set
118118
// This constant is used for Status.CurrentVersion initialization to maintain backwards compatibility
119-
DefaultRabbitMQVersion = "4.0"
119+
DefaultRabbitMQVersion = "3.9"
120120
// UpgradeCheckInterval is how often to check upgrade progress
121121
UpgradeCheckInterval = 2 * time.Second
122122
)

test/functional/rabbitmq_controller_test.go

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ var _ = Describe("RabbitMQ Controller", func() {
122122
DeferCleanup(th.DeleteSecret, types.NamespacedName{Name: certSecret.Name, Namespace: namespace})
123123
})
124124

125-
When("with default version (4.0)", func() {
125+
When("with default version (3.9)", func() {
126126
BeforeEach(func() {
127127
spec := GetDefaultRabbitMQSpec()
128128
spec["tls"] = map[string]any{
@@ -729,10 +729,10 @@ var _ = Describe("RabbitMQ Controller", func() {
729729
DeferCleanup(th.DeleteInstance, rabbitmq)
730730
})
731731

732-
It("should default Status.CurrentVersion to 4.0", func() {
732+
It("should default Status.CurrentVersion to 3.9", func() {
733733
Eventually(func(g Gomega) {
734734
instance := GetRabbitMQ(rabbitmqName)
735-
g.Expect(instance.Status.CurrentVersion).To(Equal("4.0"))
735+
g.Expect(instance.Status.CurrentVersion).To(Equal("3.9"))
736736
}, timeout, interval).Should(Succeed())
737737
})
738738
})
@@ -1050,7 +1050,9 @@ var _ = Describe("RabbitMQ Controller", func() {
10501050
BeforeEach(func() {
10511051
spec := GetDefaultRabbitMQSpec()
10521052
spec["queueType"] = "Quorum"
1053-
rabbitmq := CreateRabbitMQ(rabbitmqName, spec)
1053+
rabbitmq := CreateRabbitMQWithAnnotations(rabbitmqName, spec, map[string]string{
1054+
"rabbitmq.openstack.org/target-version": "4.0",
1055+
})
10541056
DeferCleanup(th.DeleteInstance, rabbitmq)
10551057

10561058
// Wait for default version initialization
@@ -1090,7 +1092,9 @@ var _ = Describe("RabbitMQ Controller", func() {
10901092
spec["tls"] = map[string]any{
10911093
"secretName": "test-tls-secret",
10921094
}
1093-
rabbitmq := CreateRabbitMQ(rabbitmqName, spec)
1095+
rabbitmq := CreateRabbitMQWithAnnotations(rabbitmqName, spec, map[string]string{
1096+
"rabbitmq.openstack.org/target-version": "4.0",
1097+
})
10941098
DeferCleanup(th.DeleteInstance, rabbitmq)
10951099

10961100
// Create TLS secret

0 commit comments

Comments
 (0)