Fix incorrectly placed end of condition and make tcpListenOptions opt…

…ional Signed-off-by: Michal Klinka <[email protected]>
bitnami · Jan 13, 2025 · a9671ea · a9671ea
1 parent 7f1d18d
commit a9671ea
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/bitnami/rabbitmq/Chart.yaml b/bitnami/rabbitmq/Chart.yaml
@@ -30,4 +30,4 @@ maintainers:
 name: rabbitmq
 sources:
 - https://github.com/bitnami/charts/tree/main/bitnami/rabbitmq
-version: 15.2.2
+version: 15.2.3
diff --git a/bitnami/rabbitmq/README.md b/bitnami/rabbitmq/README.md
@@ -482,6 +482,7 @@ Because they expose different sets of data, a valid use case is to scrape metric
 | `initScriptsSecret`                          | Secret containing `/docker-entrypoint-initdb.d` scripts to be executed at initialization time that contain sensitive data. Evaluated as a template.                     | `""`                                              |
 | `extraContainerPorts`                        | Extra ports to be included in container spec, primarily informational                                                                                                   | `[]`                                              |
 | `configuration`                              | RabbitMQ Configuration file content: required cluster configuration                                                                                                     | `""`                                              |
+| `tcpListenOptions.enabled`                   | Enable TCP listen options of RabbitMQ                                                                                                                                   | `true`                                            |
 | `tcpListenOptions.backlog`                   | Maximum size of the unaccepted TCP connections queue                                                                                                                    | `128`                                             |
 | `tcpListenOptions.nodelay`                   | When set to true, deactivates Nagle's algorithm. Default is true. Highly recommended for most users.                                                                    | `true`                                            |
 | `tcpListenOptions.linger.lingerOn`           | Enable Server socket lingering                                                                                                                                          | `true`                                            |

diff --git a/bitnami/rabbitmq/values.yaml b/bitnami/rabbitmq/values.yaml
@@ -385,6 +385,9 @@ extraContainerPorts: []
 ## See : https://www.rabbitmq.com/networking.html for additional information
 ##
 tcpListenOptions:
+  ## @param tcpListenOptions.enabled Enable TCP listen options of RabbitMQ
+  ##
+  enabled: true
   ## @param tcpListenOptions.backlog Maximum size of the unaccepted TCP connections queue
   ##
   backlog: 128
@@ -511,8 +514,10 @@ configuration: |-
   {{- else if (eq .Values.memoryHighWatermark.type "relative") }}
   vm_memory_high_watermark.{{ .Values.memoryHighWatermark.type }} = {{ .Values.memoryHighWatermark.value }}
   {{- end }}
+  {{- end }}
   ## TCP Listen Options
   ##
+  {{- if .Values.tcpListenOptions.enabled }}
   tcp_listen_options.backlog = {{ .Values.tcpListenOptions.backlog }}
   tcp_listen_options.nodelay = {{ .Values.tcpListenOptions.nodelay }}
   tcp_listen_options.linger.on      = {{ .Values.tcpListenOptions.linger.lingerOn }}