[stable/rabbitmq] Added support for advanced.config file (helm#14902)

* Added support for advanced.config file Signed-off-by: Radek Hodain <[email protected]> * bumped chart version Signed-off-by: Radek Hodain <[email protected]> * removed unnecessary row Signed-off-by: Radek Hodain <[email protected]>
davidkarlsen · Jul 3, 2019 · ecf34c4 · ecf34c4
1 parent fcc9370
commit ecf34c4
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 3 deletions.
diff --git a/stable/rabbitmq/Chart.yaml b/stable/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/stable/rabbitmq/README.md b/stable/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/stable/rabbitmq/templates/configuration.yaml b/stable/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/stable/rabbitmq/templates/statefulset.yaml b/stable/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/stable/rabbitmq/values-production.yaml b/stable/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/stable/rabbitmq/values.yaml b/stable/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