From 66cb3a49f64dae71a27faf4f3b41db40c69bcff8 Mon Sep 17 00:00:00 2001
From: Khor Shu Heng <32997938+khorshuheng@users.noreply.github.com>
Date: Wed, 23 Oct 2019 13:32:13 +0800
Subject: [PATCH] [stable/envoy] Add support for static load balancer IP
 (#18219)

Signed-off-by: Shu Heng <solemnpriest@gmail.com>
---
 stable/envoy/Chart.yaml             | 2 +-
 stable/envoy/templates/service.yaml | 3 +++
 stable/envoy/values.yaml            | 2 ++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/stable/envoy/Chart.yaml b/stable/envoy/Chart.yaml
index 3b575282ee..80252f46ed 100755
--- a/stable/envoy/Chart.yaml
+++ b/stable/envoy/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: Envoy is an open source edge and service proxy, designed for cloud-native applications.
 name: envoy
-version: 1.7.0
+version: 1.8.0
 appVersion: 1.11.2
 keywords:
 - envoy
diff --git a/stable/envoy/templates/service.yaml b/stable/envoy/templates/service.yaml
index bf967c4ad4..9bf6708cd1 100644
--- a/stable/envoy/templates/service.yaml
+++ b/stable/envoy/templates/service.yaml
@@ -14,6 +14,9 @@ metadata:
 {{- end }}
 spec:
   type: {{ .Values.service.type }}
+  {{- if ne .Values.service.loadBalancerIP "" }}
+  loadBalancerIp: {{ .Values.service.loadBalancerIP }}
+  {{- end }}
   ports:
   {{- range $key, $value := .Values.service.ports }}
     - name: {{ $key }}
diff --git a/stable/envoy/values.yaml b/stable/envoy/values.yaml
index 9b377e3491..2849174e38 100644
--- a/stable/envoy/values.yaml
+++ b/stable/envoy/values.yaml
@@ -36,6 +36,8 @@ service:
   ## Service name is user-configurable for maximum service discovery flexibility.
   name: envoy
   type: ClusterIP
+  ## Ignored if the type is not LoadBalancer or if the IP is empty string
+  loadBalancerIP: ""
   annotations: {}
     ## AWS example for use with LoadBalancer service type.
     # external-dns.alpha.kubernetes.io/hostname: envoy.cluster.local