From 7d17ff35fa13c84d5981e69a1e3ca027cdf78b38 Mon Sep 17 00:00:00 2001
From: Nithya <nithyashree675@gmail.com>
Date: Mon, 15 Nov 2021 23:13:52 +0000
Subject: [PATCH] helm chart: choice option for internal/external loadbalancer
 type service (#7806)

---
 charts/ingress-nginx/templates/_params.tpl             | 6 +++++-
 charts/ingress-nginx/templates/controller-service.yaml | 2 +-
 charts/ingress-nginx/values.yaml                       | 3 +++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/charts/ingress-nginx/templates/_params.tpl b/charts/ingress-nginx/templates/_params.tpl
index d74798b98..64a462eaa 100644
--- a/charts/ingress-nginx/templates/_params.tpl
+++ b/charts/ingress-nginx/templates/_params.tpl
@@ -3,8 +3,12 @@
 {{- if .Values.defaultBackend.enabled }}
 - --default-backend-service=$(POD_NAMESPACE)/{{ include "ingress-nginx.defaultBackend.fullname" . }}
 {{- end }}
-{{- if .Values.controller.publishService.enabled }}
+{{- if and .Values.controller.publishService.enabled .Values.controller.service.enabled }}
+{{- if .Values.controller.service.external.enabled }}
 - --publish-service={{ template "ingress-nginx.controller.publishServicePath" . }}
+{{- else if .Values.controller.service.internal.enabled }}
+- --publish-service={{ template "ingress-nginx.controller.publishServicePath" . }}-internal
+{{- end }}
 {{- end }}
 - --election-id={{ .Values.controller.electionID }}
 - --controller-class={{ .Values.controller.ingressClassResource.controllerValue }}
diff --git a/charts/ingress-nginx/templates/controller-service.yaml b/charts/ingress-nginx/templates/controller-service.yaml
index f0245249f..90a0eb994 100644
--- a/charts/ingress-nginx/templates/controller-service.yaml
+++ b/charts/ingress-nginx/templates/controller-service.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.controller.service.enabled -}}
+{{- if and .Values.controller.service.enabled .Values.controller.service.external.enabled -}}
 apiVersion: v1
 kind: Service
 metadata:
diff --git a/charts/ingress-nginx/values.yaml b/charts/ingress-nginx/values.yaml
index 048f89854..1b2e08243 100644
--- a/charts/ingress-nginx/values.yaml
+++ b/charts/ingress-nginx/values.yaml
@@ -494,6 +494,9 @@ controller:
       tcp: {}
       udp: {}
 
+    external:
+      enabled: true
+
     ## Enables an additional internal load balancer (besides the external one).
     ## Annotations are mandatory for the load balancer to come up. Varies with the cloud service.
     internal: