From cdf577f4d43c4152b57aa226ab24779c8f290643 Mon Sep 17 00:00:00 2001
From: Kirill Buev <kirill.buev@pm.me>
Date: Wed, 16 Dec 2020 20:29:17 +0300
Subject: [PATCH] [bitnami/nginx-ingress-controller] Use correct port for
 ingress-nginx healthchecks (#4739)

---
 bitnami/nginx-ingress-controller/Chart.yaml             | 2 +-
 bitnami/nginx-ingress-controller/values-production.yaml | 4 ++--
 bitnami/nginx-ingress-controller/values.yaml            | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bitnami/nginx-ingress-controller/Chart.yaml b/bitnami/nginx-ingress-controller/Chart.yaml
index b1e4e537a..6e6f1ce68 100644
--- a/bitnami/nginx-ingress-controller/Chart.yaml
+++ b/bitnami/nginx-ingress-controller/Chart.yaml
@@ -26,4 +26,4 @@ name: nginx-ingress-controller
 sources:
   - https://github.com/bitnami/bitnami-docker-nginx-ingress-controller
   - https://github.com/kubernetes/ingress-nginx
-version: 7.0.3
+version: 7.0.4
diff --git a/bitnami/nginx-ingress-controller/values-production.yaml b/bitnami/nginx-ingress-controller/values-production.yaml
index 454c21c9a..1ed2687f8 100644
--- a/bitnami/nginx-ingress-controller/values-production.yaml
+++ b/bitnami/nginx-ingress-controller/values-production.yaml
@@ -240,7 +240,7 @@ livenessProbe:
   enabled: true
   httpGet:
     path: /healthz
-    port: http
+    port: "{{ .Values.containerPorts.metrics }}"
     scheme: HTTP
   failureThreshold: 3
   initialDelaySeconds: 10
@@ -251,7 +251,7 @@ readinessProbe:
   enabled: true
   httpGet:
     path: /healthz
-    port: http
+    port: "{{ .Values.containerPorts.metrics }}"
     scheme: HTTP
   failureThreshold: 3
   initialDelaySeconds: 10
diff --git a/bitnami/nginx-ingress-controller/values.yaml b/bitnami/nginx-ingress-controller/values.yaml
index 7a17999e5..3fe1c5d20 100644
--- a/bitnami/nginx-ingress-controller/values.yaml
+++ b/bitnami/nginx-ingress-controller/values.yaml
@@ -240,7 +240,7 @@ livenessProbe:
   enabled: true
   httpGet:
     path: /healthz
-    port: http
+    port: "{{ .Values.containerPorts.metrics }}"
     scheme: HTTP
   failureThreshold: 3
   initialDelaySeconds: 10
@@ -251,7 +251,7 @@ readinessProbe:
   enabled: true
   httpGet:
     path: /healthz
-    port: http
+    port: "{{ .Values.containerPorts.metrics }}"
     scheme: HTTP
   failureThreshold: 3
   initialDelaySeconds: 10