diff --git a/CHANGELOG.md b/CHANGELOG.md index 9760c739..d9ad4aaa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## In Development + +## v0.19.0 +* Configure RabbitMQ Queue mirroring by default, see https://www.rabbitmq.com/ha.html (#78) + ## v0.18.0 * Pin st2 to `v3.2dev` as a new latest development version (#77) diff --git a/Chart.yaml b/Chart.yaml index 19566c0b..751fcd45 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 # Update StackStorm version here to rely on other Docker images tags appVersion: 3.2dev name: stackstorm-ha -version: 0.18.0 +version: 0.19.0 description: StackStorm K8s Helm Chart, optimized for running StackStorm in HA environment. home: https://stackstorm.com/#product icon: https://avatars1.githubusercontent.com/u/4969009 diff --git a/requirements.yaml b/requirements.yaml index f39544f8..d1c0dd47 100644 --- a/requirements.yaml +++ b/requirements.yaml @@ -1,6 +1,6 @@ dependencies: - name: rabbitmq-ha - version: 1.20.1 + version: 1.31.0 repository: https://kubernetes-charts.storage.googleapis.com/ - name: mongodb-replicaset version: 3.9.2 diff --git a/templates/configmaps_st2-conf.yaml b/templates/configmaps_st2-conf.yaml index a9fd8cf5..ce6a6c9d 100644 --- a/templates/configmaps_st2-conf.yaml +++ b/templates/configmaps_st2-conf.yaml @@ -23,7 +23,6 @@ data: [coordination] url = etcd://{{ .Release.Name }}-etcd:2379 [messaging] - # TODO: RabbitMQ HQ connection string needs templating based on number of nodes url = amqp://{{ required "rabbitmq-ha.rabbitmqUsername is required!" (index .Values "rabbitmq-ha" "rabbitmqUsername") }}:{{ required "rabbitmq-ha.rabbitmqPassword is required!" (index .Values "rabbitmq-ha" "rabbitmqPassword") }}@{{ .Release.Name }}-rabbitmq-ha-discovery:5672 [database] # TODO: ReplicaSet connection string needs templating based on number of MongoDB nodes diff --git a/values.yaml b/values.yaml index 5d1ad0a6..348aac34 100644 --- a/values.yaml +++ b/values.yaml @@ -384,6 +384,12 @@ rabbitmq-ha: rabbitmqPassword: 9jS+w1u07NbHtZke1m+jW4Cj persistentVolume: enabled: true + # RabbitMQ application vhost, should match with 'ha' Queue Mirroring definition policy + rabbitmqVhost: "/" + definitions: + # Enable Queue Mirroring between nodes + # See https://www.rabbitmq.com/ha.html + policies: '{"vhost":"/","name":"ha","pattern":"", "definition":{"ha-mode":"all","ha-sync-mode":"automatic","ha-sync-batch-size":10}}' ## ## Etcd HA configuration (3rd party chart dependency)