From 0ecf2e44d596058bb31fd5389af1cde7340829e5 Mon Sep 17 00:00:00 2001 From: Austin Orth Date: Wed, 13 Nov 2019 07:41:13 -0800 Subject: [PATCH] [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 * 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 --- stable/rabbitmq-ha/Chart.yaml | 2 +- stable/rabbitmq-ha/README.md | 2 +- stable/rabbitmq-ha/templates/service.yaml | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/stable/rabbitmq-ha/Chart.yaml b/stable/rabbitmq-ha/Chart.yaml index 5bd44f200c..2efaf352f4 100644 --- a/stable/rabbitmq-ha/Chart.yaml +++ b/stable/rabbitmq-ha/Chart.yaml @@ -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: diff --git a/stable/rabbitmq-ha/README.md b/stable/rabbitmq-ha/README.md index df1a9fe158..d84b8d338a 100644 --- a/stable/rabbitmq-ha/README.md +++ b/stable/rabbitmq-ha/README.md @@ -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) | `[]` | diff --git a/stable/rabbitmq-ha/templates/service.yaml b/stable/rabbitmq-ha/templates/service.yaml index 5ab4d873d0..f10411ea41 100644 --- a/stable/rabbitmq-ha/templates/service.yaml +++ b/stable/rabbitmq-ha/templates/service.yaml @@ -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 }}