Skip to content

Use RabbitMQ management image variant #443

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 4, 2020
Merged

Use RabbitMQ management image variant #443

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
34f6600
Use management variant of RabbitMQ image as default
Zerpet Nov 3, 2020
6f0af78
Update RabbitMQ helm chart to also use the management variant
Zerpet Nov 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion api/v1beta1/rabbitmqcluster_types.go
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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 charts/rabbitmq/example-configurations.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ annotations:

replicas: 3

image: "rabbitmq:3.8.1"
image: "rabbitmq:3.8.9-management"

imagePullSecret: foo

Expand Down
2 changes: 1 addition & 1 deletion charts/rabbitmq/expected-template-output
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ metadata:
annotation2: bar

spec:
image: rabbitmq:3.8.1
image: rabbitmq:3.8.9-management
imagePullSecret: foo
replicas: 3
service:
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/rabbitmq.com_rabbitmqclusters.yaml
View file
Open in desktop
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