From f660c2934830b140b205ef05a22edc897a47475e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Pervill=C3=A9?=
<julien.perville@perfect-memory.com>
Date: Fri, 4 Sep 2020 13:54:11 +0200
Subject: [PATCH] Declare port 10254 in nginx ingress pod template (#6609)
---
.../ingress_controller/ingress_nginx/defaults/main.yml | 1 +
.../templates/ds-ingress-nginx-controller.yml.j2 | 5 +++++
2 files changed, 6 insertions(+)
diff --git a/roles/kubernetes-apps/ingress_controller/ingress_nginx/defaults/main.yml b/roles/kubernetes-apps/ingress_controller/ingress_nginx/defaults/main.yml
index 409468436..79cf08dfd 100644
--- a/roles/kubernetes-apps/ingress_controller/ingress_nginx/defaults/main.yml
+++ b/roles/kubernetes-apps/ingress_controller/ingress_nginx/defaults/main.yml
@@ -7,6 +7,7 @@ ingress_nginx_nodeselector:
ingress_nginx_tolerations: []
ingress_nginx_insecure_port: 80
ingress_nginx_secure_port: 443
+ingress_nginx_metrics_port: 10254
ingress_nginx_configmap: {}
ingress_nginx_configmap_tcp_services: {}
ingress_nginx_configmap_udp_services: {}
diff --git a/roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/ds-ingress-nginx-controller.yml.j2 b/roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/ds-ingress-nginx-controller.yml.j2
index 6b35a290e..039ccd01d 100644
--- a/roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/ds-ingress-nginx-controller.yml.j2
+++ b/roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/ds-ingress-nginx-controller.yml.j2
@@ -84,6 +84,11 @@ spec:
- name: https
containerPort: 443
hostPort: {{ ingress_nginx_secure_port }}
+ - name: metrics
+ containerPort: 10254
+{% if not ingress_nginx_host_network %}
+ hostPort: {{ ingress_nginx_metrics_port }}
+{% endif %}
livenessProbe:
failureThreshold: 3
httpGet:
--
GitLab