diff --git a/rabbitmq/Chart.yaml b/rabbitmq/Chart.yaml index f3ea840ff..baebd29a0 100644 --- a/rabbitmq/Chart.yaml +++ b/rabbitmq/Chart.yaml @@ -15,6 +15,6 @@ apiVersion: v1 appVersion: v3.9.0 description: OpenStack-Helm RabbitMQ name: rabbitmq -version: 0.1.27 +version: 0.1.28 home: https://github.com/rabbitmq/rabbitmq-server ... diff --git a/rabbitmq/templates/configmap-etc.yaml b/rabbitmq/templates/configmap-etc.yaml index de0cd7578..88b532eea 100644 --- a/rabbitmq/templates/configmap-etc.yaml +++ b/rabbitmq/templates/configmap-etc.yaml @@ -47,7 +47,7 @@ limitations under the License. {{- $_ := tuple "oslo_messaging" "internal" "amqp" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | set $envAll.Values.conf.rabbitmq.listeners "ssl.1" -}} {{- $_ := tuple "oslo_messaging" "internal" "https" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | set $envAll.Values.conf.rabbitmq "management.ssl.port" -}} {{- else }} -{{- $_ := print ":::" ( tuple "oslo_messaging" "internal" "amqp" . | include "helm-toolkit.endpoints.endpoint_port_lookup") | set $envAll.Values.conf.rabbitmq.listeners.tcp "1" -}} +{{- $_ := print $envAll.Values.conf.bind_address ":" ( tuple "oslo_messaging" "internal" "amqp" . | include "helm-toolkit.endpoints.endpoint_port_lookup") | set $envAll.Values.conf.rabbitmq.listeners.tcp "1" -}} {{- $_ := tuple "oslo_messaging" "internal" "http" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | set $envAll.Values.conf.rabbit_additonal_conf "management.listener.port" -}} {{- end }} diff --git a/rabbitmq/values.yaml b/rabbitmq/values.yaml index 2ec003104..732a9e407 100644 --- a/rabbitmq/values.yaml +++ b/rabbitmq/values.yaml @@ -189,6 +189,8 @@ conf: skip_queues: "^$" include_queues: ".*" rabbit_exporters: "overview,exchange,node,queue" + # This IP could be IPv4/IPv6 and the tcp port will be appended to it and eventually it is set to rabbitmq.listeners.tcp.1 + bind_address: "::" rabbitmq: listeners: tcp: diff --git a/releasenotes/notes/rabbitmq.yaml b/releasenotes/notes/rabbitmq.yaml index 3a2746097..0f89f2ed1 100644 --- a/releasenotes/notes/rabbitmq.yaml +++ b/releasenotes/notes/rabbitmq.yaml @@ -27,4 +27,5 @@ rabbitmq: - 0.1.25 Add hostPort support - 0.1.26 Moved guest admin removal to init template - 0.1.27 Replace node-role.kubernetes.io/master with control-plane + - 0.1.28 Add IPv6 environment support for rabbitmq ...