From e594d32423f27a46d64c56ddb9c925dc3a89fee7 Mon Sep 17 00:00:00 2001 From: andrea-defraia <56583671+andrea-defraia@users.noreply.github.com> Date: Tue, 5 Nov 2019 22:16:40 +0100 Subject: [PATCH] Replace hardcoded port 10254 with variable. This allows to run multiple (#18555) controllers without port conflicts Signed-off-by: Andrea Defraia --- stable/nginx-ingress/Chart.yaml | 2 +- stable/nginx-ingress/templates/controller-daemonset.yaml | 2 +- stable/nginx-ingress/templates/controller-deployment.yaml | 2 +- stable/nginx-ingress/values.yaml | 2 ++ 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/stable/nginx-ingress/Chart.yaml b/stable/nginx-ingress/Chart.yaml index b45253b023..3980033058 100644 --- a/stable/nginx-ingress/Chart.yaml +++ b/stable/nginx-ingress/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: nginx-ingress -version: 1.24.5 +version: 1.24.6 appVersion: 0.26.1 home: https://github.com/kubernetes/ingress-nginx description: An nginx Ingress controller that uses ConfigMap to store the nginx configuration. diff --git a/stable/nginx-ingress/templates/controller-daemonset.yaml b/stable/nginx-ingress/templates/controller-daemonset.yaml index ec1740e694..1f1117853d 100644 --- a/stable/nginx-ingress/templates/controller-daemonset.yaml +++ b/stable/nginx-ingress/templates/controller-daemonset.yaml @@ -140,7 +140,7 @@ spec: {{- end }} {{- if .Values.controller.metrics.enabled }} - name: metrics - containerPort: 10254 + containerPort: {{ .Values.controller.metrics.port }} protocol: TCP {{- end }} {{- if .Values.controller.admissionWebhooks.enabled }} diff --git a/stable/nginx-ingress/templates/controller-deployment.yaml b/stable/nginx-ingress/templates/controller-deployment.yaml index 7dc230d932..6bdc69a22e 100644 --- a/stable/nginx-ingress/templates/controller-deployment.yaml +++ b/stable/nginx-ingress/templates/controller-deployment.yaml @@ -136,7 +136,7 @@ spec: {{- end }} {{- if .Values.controller.metrics.enabled }} - name: metrics - containerPort: 10254 + containerPort: {{ .Values.controller.metrics.port }} protocol: TCP {{- end }} {{- if .Values.controller.admissionWebhooks.enabled }} diff --git a/stable/nginx-ingress/values.yaml b/stable/nginx-ingress/values.yaml index ef2b0ffc0d..69137d4a67 100644 --- a/stable/nginx-ingress/values.yaml +++ b/stable/nginx-ingress/values.yaml @@ -338,6 +338,8 @@ controller: nodeSelector: {} metrics: + port: 10254 + # if this port is changed, change healthz-port: in extraArgs: accordingly enabled: false service: