From 96b8887d697963e30f2df55cff45133f4d4c8aff Mon Sep 17 00:00:00 2001
From: Austin Orth <aorth@niche.com>
Date: Sun, 3 Nov 2019 06:43:39 -0800
Subject: [PATCH] [stable/fluentd] Added service.loadBalancerIP (#18498)

Added conditional to the service template and documentation to both the
values file and the readme for setting custom load balancer IP address.

Signed-off-by: Austin Orth <aorth@niche.com>
---
 stable/fluentd/Chart.yaml             | 2 +-
 stable/fluentd/README.md              | 1 +
 stable/fluentd/templates/service.yaml | 3 +++
 stable/fluentd/values.yaml            | 1 +
 4 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/stable/fluentd/Chart.yaml b/stable/fluentd/Chart.yaml
index 3c941244eb..8918e16373 100644
--- a/stable/fluentd/Chart.yaml
+++ b/stable/fluentd/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 description: A Fluentd Elasticsearch Helm chart for Kubernetes.
 icon: https://raw.githubusercontent.com/fluent/fluentd-docs/master/public/logo/Fluentd_square.png
 name: fluentd
-version: 2.1.3
+version: 2.2.0
 appVersion: v2.4.0
 home: https://www.fluentd.org/
 sources:
diff --git a/stable/fluentd/README.md b/stable/fluentd/README.md
index 3de49457ec..050dcaf4cc 100644
--- a/stable/fluentd/README.md
+++ b/stable/fluentd/README.md
@@ -71,6 +71,7 @@ Parameter | Description | Default
 `serviceAccount.create` | Specifies whether a service account should be created. | `true`
 `serviceAccount.name` | Name of the service account.
 `priorityClassName` | priorityClassName | `nil`
+`service.loadBalancerIP` | If `service.type` is `LoadBalancer` set custom IP load balancer IP address | `nil`
 `service.ports` | port definition for the service | See [values.yaml](values.yaml)
 `service.type` | type of service | `ClusterIP`
 `service.annotations` | list of annotations for the service | `{}`
diff --git a/stable/fluentd/templates/service.yaml b/stable/fluentd/templates/service.yaml
index fc7a35ca36..1590cb50a8 100644
--- a/stable/fluentd/templates/service.yaml
+++ b/stable/fluentd/templates/service.yaml
@@ -11,6 +11,9 @@ metadata:
 {{ toYaml .Values.service.annotations | indent 4 }}
 spec:
   type: {{ .Values.service.type }}
+  {{ if (and (eq .Values.service.type "LoadBalancer") (not (empty .Values.service.loadBalancerIP))) }}
+  loadBalancerIP: {{ .Values.service.loadBalancerIP }}
+  {{ end }}
   ports:
   {{- range $port := .Values.service.ports }}
     - name: {{ $port.name }}
diff --git a/stable/fluentd/values.yaml b/stable/fluentd/values.yaml
index f7d6af923f..37b14b6f46 100644
--- a/stable/fluentd/values.yaml
+++ b/stable/fluentd/values.yaml
@@ -34,6 +34,7 @@ plugins:
 service:
   annotations: {}
   type: ClusterIP
+  # loadBalancerIP:
   # type: NodePort
   # nodePort:
   # Used to create Service records