Skip to content

Commit

Permalink
Use management variant of RabbitMQ image as default
Browse files Browse the repository at this point in the history
The non-managemet variant disabled metric collection in RabbitMQ
configuration and it's not straightforward to re-enable them. The
managmenet image does not disable these metrics and we want to always
enable the management UI.
  • Loading branch information
Zerpet committed Nov 3, 2020
1 parent bab4c6e commit 34f6600
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion api/v1beta1/rabbitmqcluster_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ type RabbitmqClusterSpec struct {
// +kubebuilder:default:=1
Replicas *int32 `json:"replicas,omitempty"`
// Image is the name of the RabbitMQ docker image to use for RabbitMQ nodes in the RabbitmqCluster.
// +kubebuilder:default:="rabbitmq:3.8.9"
// +kubebuilder:default:="rabbitmq:3.8.9-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 @@ -474,7 +474,7 @@ func generateRabbitmqClusterObject(clusterName string) *RabbitmqCluster {
},
Spec: RabbitmqClusterSpec{
Replicas: pointer.Int32Ptr(1),
Image: "rabbitmq:3.8.9",
Image: "rabbitmq:3.8.9-management",
TerminationGracePeriodSeconds: pointer.Int64Ptr(604800),
Service: RabbitmqClusterServiceSpec{
Type: "ClusterIP",
Expand Down
2 changes: 1 addition & 1 deletion bin/kubectl-rabbitmq
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ usage() {
echo " kubectl rabbitmq delete INSTANCE ..."
echo
echo " Create a RabbitMQ custom resource - INSTANCE name required, all other flags optional"
echo " kubectl rabbitmq create INSTANCE --replicas 1 --service ClusterIP --image rabbitmq:3.8.9 --image-pull-secret mysecret"
echo " kubectl rabbitmq create INSTANCE --replicas 1 --service ClusterIP --image rabbitmq:3.8.9-management --image-pull-secret mysecret"
echo " --tls-secret secret-name --storage-class mystorageclass"
echo
echo " Get a RabbitMQ custom resource and dependant objects"
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/rabbitmq.com_rabbitmqclusters.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -643,7 +643,7 @@ spec:
type: object
type: object
image:
default: rabbitmq:3.8.9
default: rabbitmq:3.8.9-management
description: Image is the name of the RabbitMQ docker image to use
for RabbitMQ nodes in the RabbitmqCluster.
type: string
Expand Down

0 comments on commit 34f6600

Please sign in to comment.