Merge pull request #443 from rabbitmq/cluster-operator-441

Use RabbitMQ management image variant
rabbitmq · Nov 4, 2020 · 7620e52 · 7620e52
2 parents 459c281 + 6f0af78
commit 7620e52
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/api/v1beta1/rabbitmqcluster_types.go b/api/v1beta1/rabbitmqcluster_types.go
@@ -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"`

diff --git a/api/v1beta1/rabbitmqcluster_types_test.go b/api/v1beta1/rabbitmqcluster_types_test.go
@@ -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",

diff --git a/bin/kubectl-rabbitmq b/bin/kubectl-rabbitmq
@@ -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"

diff --git a/charts/rabbitmq/example-configurations.yaml b/charts/rabbitmq/example-configurations.yaml
@@ -17,7 +17,7 @@ annotations:
 
 replicas: 3
 
-image: "rabbitmq:3.8.1"
+image: "rabbitmq:3.8.9-management"
 
 imagePullSecret: foo
 

diff --git a/charts/rabbitmq/expected-template-output b/charts/rabbitmq/expected-template-output
@@ -20,7 +20,7 @@ metadata:
     annotation2: bar
 
 spec:
-  image: rabbitmq:3.8.1
+  image: rabbitmq:3.8.9-management
   imagePullSecret: foo
   replicas: 3
   service:

diff --git a/config/crd/bases/rabbitmq.com_rabbitmqclusters.yaml b/config/crd/bases/rabbitmq.com_rabbitmqclusters.yaml
@@ -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