Skip to content

Commit 7accb04

Browse files
authored
Bump default rmq image to 3.8.21 (#804)
* Bump default rmq image to 3.8.21
1 parent fec7f9c commit 7accb04

File tree

6 files changed

+7
-7
lines changed

6 files changed

+7
-7
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ under `site/kubernetes`.
3737

3838
## Supported Versions
3939

40-
The operator deploys RabbitMQ `3.8.19` by default, and supports versions from `3.8.8` upwards. The operator requires Kubernetes `1.18` or newer.
40+
The operator deploys RabbitMQ `3.8.21` by default, and supports versions from `3.8.8` upwards. The operator requires Kubernetes `1.18` or newer.
4141

4242
## Versioning
4343

api/v1beta1/rabbitmqcluster_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ type RabbitmqClusterSpec struct {
5050
Replicas *int32 `json:"replicas,omitempty"`
5151
// Image is the name of the RabbitMQ docker image to use for RabbitMQ nodes in the RabbitmqCluster.
5252
// Must be provided together with ImagePullSecrets in order to use an image in a private registry.
53-
// +kubebuilder:default:="rabbitmq:3.8.19-management"
53+
// +kubebuilder:default:="rabbitmq:3.8.21-management"
5454
Image string `json:"image,omitempty"`
5555
// List of Secret resource containing access credentials to the registry for the RabbitMQ image. Required if the docker registry is private.
5656
ImagePullSecrets []corev1.LocalObjectReference `json:"imagePullSecrets,omitempty"`

api/v1beta1/rabbitmqcluster_types_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -480,7 +480,7 @@ func generateRabbitmqClusterObject(clusterName string) *RabbitmqCluster {
480480
},
481481
Spec: RabbitmqClusterSpec{
482482
Replicas: pointer.Int32Ptr(1),
483-
Image: "rabbitmq:3.8.19-management",
483+
Image: "rabbitmq:3.8.21-management",
484484
TerminationGracePeriodSeconds: pointer.Int64Ptr(604800),
485485
Service: RabbitmqClusterServiceSpec{
486486
Type: "ClusterIP",

config/crd/bases/rabbitmq.com_rabbitmqclusters.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ apiVersion: apiextensions.k8s.io/v1
1010
kind: CustomResourceDefinition
1111
metadata:
1212
annotations:
13-
controller-gen.kubebuilder.io/version: v0.6.1
13+
controller-gen.kubebuilder.io/version: v0.6.2
1414
creationTimestamp: null
1515
name: rabbitmqclusters.rabbitmq.com
1616
spec:
@@ -514,7 +514,7 @@ spec:
514514
type: object
515515
type: object
516516
image:
517-
default: rabbitmq:3.8.19-management
517+
default: rabbitmq:3.8.21-management
518518
description: Image is the name of the RabbitMQ docker image to use for RabbitMQ nodes in the RabbitmqCluster. Must be provided together with ImagePullSecrets in order to use an image in a private registry.
519519
type: string
520520
imagePullSecrets:

system_tests/system_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ var _ = Describe("Operator", func() {
166166
}
167167
Eventually(getConfigMapAnnotations, 30, 1).Should(
168168
HaveKey("rabbitmq.com/pluginsUpdatedAt"), "plugins ConfigMap should have been annotated")
169-
Eventually(getConfigMapAnnotations, 4 * time.Minute, 1).Should(
169+
Eventually(getConfigMapAnnotations, 4*time.Minute, 1).Should(
170170
Not(HaveKey("rabbitmq.com/pluginsUpdatedAt")), "plugins ConfigMap annotation should have been removed")
171171

172172
Eventually(func() map[string][]byte {

system_tests/utils.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -868,7 +868,7 @@ func publishAndConsumeMQTTMsg(hostname, port, username, password string, overWeb
868868

869869
EventuallyWithOffset(1, func() bool {
870870
return msgReceived
871-
}, 10 * time.Second).Should(BeTrue(), "Expect to receive message")
871+
}, 10*time.Second).Should(BeTrue(), "Expect to receive message")
872872

873873
token = c.Unsubscribe(topic)
874874
ExpectWithOffset(1, token.Wait()).To(BeTrue(), "Unsubscribe token should return true")

0 commit comments

Comments
 (0)