Skip to content

Commit

Permalink
Bump default rmq image to 3.8.21 (#804)
Browse files Browse the repository at this point in the history
* Bump default rmq image to 3.8.21
  • Loading branch information
ChunyiLyu authored Aug 17, 2021
1 parent fec7f9c commit 7accb04
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ under `site/kubernetes`.

## Supported Versions

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.
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.

## Versioning

Expand Down
2 changes: 1 addition & 1 deletion api/v1beta1/rabbitmqcluster_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ type RabbitmqClusterSpec struct {
Replicas *int32 `json:"replicas,omitempty"`
// 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.
// +kubebuilder:default:="rabbitmq:3.8.19-management"
// +kubebuilder:default:="rabbitmq:3.8.21-management"
Image string `json:"image,omitempty"`
// List of Secret resource containing access credentials to the registry for the RabbitMQ image. Required if the docker registry is private.
ImagePullSecrets []corev1.LocalObjectReference `json:"imagePullSecrets,omitempty"`
Expand Down
2 changes: 1 addition & 1 deletion api/v1beta1/rabbitmqcluster_types_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -480,7 +480,7 @@ func generateRabbitmqClusterObject(clusterName string) *RabbitmqCluster {
},
Spec: RabbitmqClusterSpec{
Replicas: pointer.Int32Ptr(1),
Image: "rabbitmq:3.8.19-management",
Image: "rabbitmq:3.8.21-management",
TerminationGracePeriodSeconds: pointer.Int64Ptr(604800),
Service: RabbitmqClusterServiceSpec{
Type: "ClusterIP",
Expand Down
4 changes: 2 additions & 2 deletions config/crd/bases/rabbitmq.com_rabbitmqclusters.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.1
controller-gen.kubebuilder.io/version: v0.6.2
creationTimestamp: null
name: rabbitmqclusters.rabbitmq.com
spec:
Expand Down Expand Up @@ -514,7 +514,7 @@ spec:
type: object
type: object
image:
default: rabbitmq:3.8.19-management
default: rabbitmq:3.8.21-management
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.
type: string
imagePullSecrets:
Expand Down
2 changes: 1 addition & 1 deletion system_tests/system_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ var _ = Describe("Operator", func() {
}
Eventually(getConfigMapAnnotations, 30, 1).Should(
HaveKey("rabbitmq.com/pluginsUpdatedAt"), "plugins ConfigMap should have been annotated")
Eventually(getConfigMapAnnotations, 4 * time.Minute, 1).Should(
Eventually(getConfigMapAnnotations, 4*time.Minute, 1).Should(
Not(HaveKey("rabbitmq.com/pluginsUpdatedAt")), "plugins ConfigMap annotation should have been removed")

Eventually(func() map[string][]byte {
Expand Down
2 changes: 1 addition & 1 deletion system_tests/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -868,7 +868,7 @@ func publishAndConsumeMQTTMsg(hostname, port, username, password string, overWeb

EventuallyWithOffset(1, func() bool {
return msgReceived
}, 10 * time.Second).Should(BeTrue(), "Expect to receive message")
}, 10*time.Second).Should(BeTrue(), "Expect to receive message")

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

0 comments on commit 7accb04

Please sign in to comment.