[stable/rabbitmq-ha] Fixed invalid value (#18503)

* [stable/rabbitmq-ha] Fixed invalid value

Set the service.clusterIP variable to an empty value and commented out,
following the standard set in other charts for optional empty values, to
avoid invalid value error. Also updated readme and bumped chart version.

Signed-off-by: Austin Orth <aorth@niche.com>

* Implemented changes suggested by reviewers

Reverted to the previous settings for the value and instead updated the
logic in the service template to avoid setting clusterIP value when type
is LoadBalancer and it is set to "None".

Signed-off-by: Austin Orth <aorth@niche.com>
This commit is contained in:
Austin Orth
2019-11-13 07:41:13 -08:00
committed by Kubernetes Prow Robot
parent 05fc8466f0
commit 0ecf2e44d5
3 changed files with 4 additions and 2 deletions
+1 -1
View File
@@ -1,7 +1,7 @@
name: rabbitmq-ha
apiVersion: v1
appVersion: 3.8.0
version: 1.36.2
version: 1.36.3
description: Highly available RabbitMQ cluster, the open source message broker
software that implements the Advanced Message Queuing Protocol (AMQP).
keywords:
+1 -1
View File
@@ -159,7 +159,7 @@ and their default values.
| `serviceAccount.automountServiceAccountToken` | Automount API credentials for a service account | `true` |
| `serviceAccount.name` | Service account name to use | _name of the release_ |
| `service.annotations` | Annotations to add to the service | `{}` |
| `service.clusterIP` | IP address to assign to the service | `None` |
| `service.clusterIP` | IP address to assign to the service | None |
| `service.externalIPs` | Service external IP addresses | `[]` |
| `service.loadBalancerIP` | IP address to assign to load balancer (if supported) | `""` |
| `service.loadBalancerSourceRanges` | List of IP CIDRs allowed access to load balancer (if supported) | `[]` |
@@ -17,8 +17,10 @@ metadata:
{{- end }}
spec:
{{- if ne .Values.service.type "NodePort" }}
{{- if and (eq .Values.service.type "LoadBalancer") (ne .Values.service.clusterIP "None") }}
clusterIP: "{{ .Values.service.clusterIP }}"
{{- end }}
{{- end }}
{{- if .Values.service.externalIPs }}
externalIPs:
{{ toYaml .Values.service.externalIPs | indent 4 }}