From 53edfb9fc5bf4888132b824da26044b38e403296 Mon Sep 17 00:00:00 2001
From: Maciej Strzelecki <mstrzele@users.noreply.github.com>
Date: Tue, 14 Apr 2020 23:15:17 +0200
Subject: [PATCH] feat: Add a load balancer IP to server's service (#306)

* add loadBalancerIP to server's service

* optimize condition
---
 charts/argo-cd/Chart.yaml                           | 2 +-
 charts/argo-cd/templates/argocd-server/service.yaml | 7 ++++++-
 charts/argo-cd/values.yaml                          | 1 +
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml
index cbad77a5..649c6ae1 100644
--- a/charts/argo-cd/Chart.yaml
+++ b/charts/argo-cd/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: "1.5.1"
 description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
-version: 2.2.2
+version: 2.2.3
 home: https://github.com/argoproj/argo-helm
 icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
 keywords:
diff --git a/charts/argo-cd/templates/argocd-server/service.yaml b/charts/argo-cd/templates/argocd-server/service.yaml
index 8c13a4e6..292bf94b 100644
--- a/charts/argo-cd/templates/argocd-server/service.yaml
+++ b/charts/argo-cd/templates/argocd-server/service.yaml
@@ -32,7 +32,12 @@ spec:
   selector:
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.server.name }}
-{{- if and (eq .Values.server.service.type "LoadBalancer") .Values.server.service.loadBalancerSourceRanges }}
+{{- if eq .Values.server.service.type "LoadBalancer" }}
+{{- if .Values.server.service.loadBalancerIP }}
+  loadBalancerIP: {{ .Values.server.service.loadBalancerIP | quote }}
+{{- end }}
+{{- if .Values.server.service.loadBalancerSourceRanges }}
   loadBalancerSourceranges:
 {{ toYaml .Values.server.service.loadBalancerSourceRanges | indent 4 }}
+{{- end }}
 {{- end -}}
diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml
index cbe7326f..5719be9c 100755
--- a/charts/argo-cd/values.yaml
+++ b/charts/argo-cd/values.yaml
@@ -404,6 +404,7 @@ server:
     type: ClusterIP
     servicePortHttp: 80
     servicePortHttps: 443
+    loadBalancerIP: ""
     loadBalancerSourceRanges: []
 
   ## Server metrics service configuration