diff --git a/upstreamed/rabbitmq/Chart.yaml b/upstreamed/rabbitmq/Chart.yaml index d566168e1..d568a5073 100644 --- a/upstreamed/rabbitmq/Chart.yaml +++ b/upstreamed/rabbitmq/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: rabbitmq -version: 6.1.0 +version: 6.1.1 appVersion: 3.7.15 description: Open source message broker software that implements the Advanced Message Queuing Protocol (AMQP) keywords: diff --git a/upstreamed/rabbitmq/README.md b/upstreamed/rabbitmq/README.md index 0e9be9074..579c6fa1f 100644 --- a/upstreamed/rabbitmq/README.md +++ b/upstreamed/rabbitmq/README.md @@ -73,6 +73,7 @@ The following table lists the configurable parameters of the RabbitMQ chart and | `rabbitmq.onlineSchedulers` | RabbitMQ online scheduler threads | `1` | | `rabbitmq.configuration` | Required cluster configuration | See values.yaml | | `rabbitmq.extraConfiguration` | Extra configuration to add to rabbitmq.conf | See values.yaml | +| `rabbitmq.advancedConfiguration` | Extra configuration (in classic format) to add to advanced.config | See values.yaml | | `service.type` | Kubernetes Service type | `ClusterIP` | | `service.port` | Amqp port | `5672` | | `service.distPort` | Erlang distribution server port | `25672` | diff --git a/upstreamed/rabbitmq/templates/configuration.yaml b/upstreamed/rabbitmq/templates/configuration.yaml index fd2c61878..44448ee49 100644 --- a/upstreamed/rabbitmq/templates/configuration.yaml +++ b/upstreamed/rabbitmq/templates/configuration.yaml @@ -16,3 +16,7 @@ data: default_pass=CHANGEME {{ .Values.rabbitmq.configuration | indent 4 }} {{ .Values.rabbitmq.extraConfiguration | indent 4 }} +{{ if .Values.rabbitmq.advancedConfiguration}} + advanced.config: |- +{{ .Values.rabbitmq.advancedConfiguration | indent 4 }} +{{ end }} diff --git a/upstreamed/rabbitmq/templates/statefulset.yaml b/upstreamed/rabbitmq/templates/statefulset.yaml index c499f59f6..a5efd486c 100644 --- a/upstreamed/rabbitmq/templates/statefulset.yaml +++ b/upstreamed/rabbitmq/templates/statefulset.yaml @@ -263,6 +263,10 @@ spec: items: - key: rabbitmq.conf path: rabbitmq.conf + {{- if .Values.rabbitmq.advancedConfiguration}} + - key: advanced.config + path: advanced.config + {{- end }} - key: enabled_plugins path: enabled_plugins {{- if .Values.rabbitmq.loadDefinition.enabled }} diff --git a/upstreamed/rabbitmq/values-production.yaml b/upstreamed/rabbitmq/values-production.yaml index 7ab20c952..f3d609e56 100644 --- a/upstreamed/rabbitmq/values-production.yaml +++ b/upstreamed/rabbitmq/values-production.yaml @@ -111,7 +111,7 @@ rabbitmq: secretName: load-definition ## Configuration file content: required cluster configuration - ## Do not override unless you know what you are doing. To add more configuration, use `extraConfiguration` instead + ## Do not override unless you know what you are doing. To add more configuration, use `extraConfiguration` of `advancedConfiguration` instead configuration: |- ## Clustering cluster_formation.peer_discovery_backend = rabbit_peer_discovery_k8s @@ -129,6 +129,10 @@ rabbitmq: extraConfiguration: |- #disk_free_limit.absolute = 50MB #management.load_definitions = /app/load_definition.json + + ## Configuration file content: advanced configuration + ## Use this as additional configuraton in classic config format (Erlang term configuration format) + advancedConfiguration: |- ## Kubernetes service type service: diff --git a/upstreamed/rabbitmq/values.yaml b/upstreamed/rabbitmq/values.yaml index f3dad2368..a062066ed 100644 --- a/upstreamed/rabbitmq/values.yaml +++ b/upstreamed/rabbitmq/values.yaml @@ -111,7 +111,7 @@ rabbitmq: secretName: load-definition ## Configuration file content: required cluster configuration - ## Do not override unless you know what you are doing. To add more configuration, use `extraConfiguration` instead + ## Do not override unless you know what you are doing. To add more configuration, use `extraConfiguration` of `advancedConfiguration` instead configuration: |- ## Clustering cluster_formation.peer_discovery_backend = rabbit_peer_discovery_k8s @@ -130,6 +130,10 @@ rabbitmq: #disk_free_limit.absolute = 50MB #management.load_definitions = /app/load_definition.json + ## Configuration file content: advanced configuration + ## Use this as additional configuraton in classic config format (Erlang term configuration format) + advancedConfiguration: |- + ## Kubernetes service type service: type: ClusterIP diff --git a/upstreamed/redis/Chart.yaml b/upstreamed/redis/Chart.yaml index d5273e80b..0fe766f20 100644 --- a/upstreamed/redis/Chart.yaml +++ b/upstreamed/redis/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: redis -version: 8.0.11 +version: 8.0.12 appVersion: 5.0.5 description: Open source, advanced key-value store. It is often referred to as a data structure server since keys can contain strings, hashes, lists, sets and sorted sets. keywords: diff --git a/upstreamed/redis/templates/redis-master-statefulset.yaml b/upstreamed/redis/templates/redis-master-statefulset.yaml index 4ece351ba..34534e58a 100644 --- a/upstreamed/redis/templates/redis-master-statefulset.yaml +++ b/upstreamed/redis/templates/redis-master-statefulset.yaml @@ -179,10 +179,6 @@ spec: printf "\nsentinel auth-pass {{ .Values.sentinel.masterSet }} $REDIS_PASSWORD" >> /opt/bitnami/redis-sentinel/etc/sentinel.conf {{- end }} fi - echo "Getting information about current running sentinels" - # Get information from existing sentinels - existing_sentinels=$(timeout -s 9 {{ .Values.sentinel.initialCheckTimeout }} redis-cli --raw -h {{ template "redis.fullname" . }} -a $REDIS_PASSWORD -p {{ .Values.sentinel.service.sentinelPort }} SENTINEL sentinels {{ .Values.sentinel.masterSet }}) - echo "$existing_sentinels" | awk -f /health/parse_sentinels.awk | tee -a /opt/bitnami/redis-sentinel/etc/sentinel.conf redis-server /opt/bitnami/redis-sentinel/etc/sentinel.conf --sentinel env: diff --git a/upstreamed/redis/templates/redis-slave-statefulset.yaml b/upstreamed/redis/templates/redis-slave-statefulset.yaml index db96d966c..aae951c81 100644 --- a/upstreamed/redis/templates/redis-slave-statefulset.yaml +++ b/upstreamed/redis/templates/redis-slave-statefulset.yaml @@ -211,10 +211,6 @@ spec: printf "\nsentinel auth-pass {{ .Values.sentinel.masterSet }} $REDIS_PASSWORD" >> /opt/bitnami/redis-sentinel/etc/sentinel.conf {{- end }} fi - echo "Getting information about current running sentinels" - # Get information from existing sentinels - existing_sentinels=$(timeout -s 9 {{ .Values.sentinel.initialCheckTimeout }} redis-cli --raw -h {{ template "redis.fullname" . }} -a $REDIS_PASSWORD -p {{ .Values.sentinel.service.sentinelPort }} SENTINEL sentinels {{ .Values.sentinel.masterSet }}) - echo "$existing_sentinels" | awk -f /health/parse_sentinels.awk | tee -a /opt/bitnami/redis-sentinel/etc/sentinel.conf redis-server /opt/bitnami/redis-sentinel/etc/sentinel.conf --sentinel env: