From 48bdeba52f87f89e562ad14e9faf1aa95e0091c9 Mon Sep 17 00:00:00 2001 From: Elijah Date: Mon, 24 Sep 2018 14:07:51 +0300 Subject: [PATCH] [stable/rabbitmq] Fix auto-generated NodePort (#7910) * [stable/rabbitmq] Fix auto-generated NodePort Signed-off-by: Ilya Reva * [stable/rabbitmq] Bump version Signed-off-by: Ilya Reva * [stable/rabbitmq] update version and readme Signed-off-by: Ilya Reva --- stable/rabbitmq/Chart.yaml | 2 +- stable/rabbitmq/README.md | 14 ++++++++------ stable/rabbitmq/templates/statefulset.yaml | 4 ++-- stable/rabbitmq/templates/svc.yaml | 4 ++-- stable/rabbitmq/values.yaml | 12 +++++++++++- 5 files changed, 24 insertions(+), 12 deletions(-) diff --git a/stable/rabbitmq/Chart.yaml b/stable/rabbitmq/Chart.yaml index 2b9f7907fe..dacf33f78b 100644 --- a/stable/rabbitmq/Chart.yaml +++ b/stable/rabbitmq/Chart.yaml @@ -1,5 +1,5 @@ name: rabbitmq -version: 3.1.0 +version: 3.2.0 appVersion: 3.7.8 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 index 3f6d9c4675..b6d8a30c81 100644 --- a/stable/rabbitmq/README.md +++ b/stable/rabbitmq/README.md @@ -51,24 +51,26 @@ The following table lists the configurable parameters of the RabbitMQ chart and | `image.pullPolicy` | Image pull policy | `Always` if `imageTag` is `latest`, else `IfNotPresent` | | `image.pullSecrets` | Specify docker-registry secret names as an array | `nil` | | `image.debug` | Specify if debug values should be set | `false` | -| `rbacEnabled` | Specify if rbac is enabled in your cluster | `true` | +| `rbacEnabled` | Specify if rbac is enabled in your cluster | `true` | | `rabbitmq.username` | RabbitMQ application username | `user` | | `rabbitmq.password` | RabbitMQ application password | _random 10 character long alphanumeric string_ | | `rabbitmq.erlangCookie` | Erlang cookie | _random 32 character long alphanumeric string_ | -| `rabbitmq.nodePort` | Node port | `5672` | +| `rabbitmq.amqpPort` | Amqp port | `5672` | +| `rabbitmq.distPort` | Erlang distribution server port | `25672` | +| `rabbitmq.nodePort` | Node port override, if serviceType NodePort | _random avaliable between 30000-32767_ | | `rabbitmq.managerPort` | RabbitMQ Manager port | `15672` | | `rabbitmq.diskFreeLimit` | Disk free limit | `"6GiB"` | -| `rabbitmq.plugins` | configuration file for plugins to enable | `[rabbitmq_management,rabbitmq_peer_discovery_k8s].` | -| `rabbitmq.configuration` | rabbitmq.conf content | see values.yaml | +| `rabbitmq.plugins` | configuration file for plugins to enable | `[rabbitmq_management,rabbitmq_peer_discovery_k8s].` | +| `rabbitmq.configuration` | rabbitmq.conf content | see values.yaml | | `serviceType` | Kubernetes Service type | `ClusterIP` | -| `persistence.enabled` | Use a PVC to persist data | `false` | +| `persistence.enabled` | Use a PVC to persist data | `false` | | `persistence.storageClass` | Storage class of backing PVC | `nil` (uses alpha storage class annotation) | | `persistence.accessMode` | Use volume as ReadOnly or ReadWrite | `ReadWriteOnce` | | `persistence.size` | Size of data volume | `8Gi` | | `securityContext.enabled` | Enable security context | `true` | | `securityContext.fsGroup` | Group ID for the container | `1001` | | `securityContext.runAsUser` | User ID for the container | `1001` | -| `resources` | resource needs and limits to apply to the pod | {} | +| `resources` | resource needs and limits to apply to the pod | {} | | `nodeSelector` | Node labels for pod assignment | {} | | `affinity` | Affinity settings for pod assignment | {} | | `tolerations` | Toleration labels for pod assignment | [] | diff --git a/stable/rabbitmq/templates/statefulset.yaml b/stable/rabbitmq/templates/statefulset.yaml index 7705cc2221..9b86c89e4e 100644 --- a/stable/rabbitmq/templates/statefulset.yaml +++ b/stable/rabbitmq/templates/statefulset.yaml @@ -81,9 +81,9 @@ spec: - name: epmd containerPort: 4369 - name: amqp - containerPort: {{ .Values.rabbitmq.nodePort }} + containerPort: {{ .Values.rabbitmq.amqpPort }} - name: dist - containerPort: {{ .Values.rabbitmq.nodePort | add 20000 }} + containerPort: {{ .Values.rabbitmq.distPort }} - name: stats containerPort: {{ .Values.rabbitmq.managerPort }} {{- if .Values.livenessProbe.enabled }} diff --git a/stable/rabbitmq/templates/svc.yaml b/stable/rabbitmq/templates/svc.yaml index 6903f2f4d0..3f744e3c6f 100644 --- a/stable/rabbitmq/templates/svc.yaml +++ b/stable/rabbitmq/templates/svc.yaml @@ -14,13 +14,13 @@ spec: port: 4369 targetPort: epmd - name: amqp - port: {{ .Values.rabbitmq.nodePort }} + port: {{ .Values.rabbitmq.amqpPort }} targetPort: amqp {{- if (and (eq .Values.serviceType "NodePort") (not (empty .Values.rabbitmq.nodePort))) }} nodePort: {{ .Values.rabbitmq.nodePort }} {{- end }} - name: dist - port: {{ .Values.rabbitmq.nodePort | add 20000 }} + port: {{ .Values.rabbitmq.distPort }} targetPort: dist - name: stats port: {{ .Values.rabbitmq.managerPort }} diff --git a/stable/rabbitmq/values.yaml b/stable/rabbitmq/values.yaml index 3816783286..9eaf1165fd 100644 --- a/stable/rabbitmq/values.yaml +++ b/stable/rabbitmq/values.yaml @@ -46,7 +46,17 @@ rabbitmq: ## Node port ## ref: https://github.com/bitnami/bitnami-docker-rabbitmq#environment-variables ## - nodePort: 5672 + # nodePort: 30672 + + ## Amqp port + ## ref: https://github.com/bitnami/bitnami-docker-rabbitmq#environment-variables + ## + amqpPort: 5672 + + ## Dist port + ## ref: https://github.com/bitnami/bitnami-docker-rabbitmq#environment-variables + ## + distPort: 25672 ## Node name to cluster with. e.g.: `clusternode@hostname` ## ref: https://github.com/bitnami/bitnami-docker-rabbitmq#environment-variables