From eef48866070a0b12c4e9203e4df9d0e4f5538760 Mon Sep 17 00:00:00 2001
From: Pranjay Sagar <pranjay.sagar@c3.ai>
Date: Tue, 30 May 2023 16:53:39 -0700
Subject: [PATCH] PLAT-64979 Update c3 c3-nginx-ingress chart to export health
 port

---
 charts/ingress-nginx/Chart.yaml                        | 8 +++-----
 charts/ingress-nginx/templates/controller-service.yaml | 9 +++++++++
 charts/ingress-nginx/values.yaml                       | 3 +++
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/charts/ingress-nginx/Chart.yaml b/charts/ingress-nginx/Chart.yaml
index 30ca8afaa..c9bfd0ae3 100644
--- a/charts/ingress-nginx/Chart.yaml
+++ b/charts/ingress-nginx/Chart.yaml
@@ -13,10 +13,8 @@ keywords:
 - nginx
 kubeVersion: '>=1.20.0-0'
 maintainers:
-- name: rikatz
-- name: strongjz
-- name: tao12345666333
-name: ingress-nginx
+- name: Pranjay Sagar
+name: c3-nginx-ingress
 sources:
-- https://github.com/kubernetes/ingress-nginx
+- https://ci-artifacts.c3.ai/v1/helm
 version: 4.8.3
diff --git a/charts/ingress-nginx/templates/controller-service.yaml b/charts/ingress-nginx/templates/controller-service.yaml
index 1daec5b48..6772249c4 100644
--- a/charts/ingress-nginx/templates/controller-service.yaml
+++ b/charts/ingress-nginx/templates/controller-service.yaml
@@ -76,6 +76,15 @@ spec:
       nodePort: {{ .Values.controller.service.nodePorts.https }}
     {{- end }}
   {{- end }}
+  {{- if .Values.controller.service.exposeHealthPort }}
+    - name: health
+      port: {{ .Values.controller.service.ports.health }}
+      protocol: TCP
+      targetPort: {{ .Values.controller.service.targetPorts.health }}
+    {{- if and (semverCompare ">=1.20" .Capabilities.KubeVersion.Version) (.Values.controller.service.appProtocol) }}
+      appProtocol: https
+    {{- end }}
+  {{- end }}
   {{- range $key, $value := .Values.tcp }}
     - name: {{ if $.Values.portNamePrefix }}{{ $.Values.portNamePrefix }}-{{ end }}{{ $key }}-tcp
       port: {{ $key }}
diff --git a/charts/ingress-nginx/values.yaml b/charts/ingress-nginx/values.yaml
index c043b6258..a6046a7f7 100644
--- a/charts/ingress-nginx/values.yaml
+++ b/charts/ingress-nginx/values.yaml
@@ -459,6 +459,7 @@ controller:
     loadBalancerClass: ""
     enableHttp: true
     enableHttps: true
+    exposeHealthPort: false
     ## Set external traffic policy to: "Local" to preserve source IP on providers supporting it.
     ## Ref: https://kubernetes.io/docs/tutorials/services/source-ip/#source-ip-for-services-with-typeloadbalancer
     # externalTrafficPolicy: ""
@@ -485,9 +486,11 @@ controller:
     ports:
       http: 80
       https: 443
+      health: 10254
     targetPorts:
       http: http
       https: https
+      health: 10254
     type: LoadBalancer
     ## type: NodePort
     ## nodePorts: