From 54f070577bdb0a8b11687da91e9e08d84aab2020 Mon Sep 17 00:00:00 2001 From: Maciej Strzelecki Date: Sat, 2 Sep 2017 16:52:46 +0200 Subject: [PATCH] [stable/nginx-ingress] Allow to configure source IP preservation on Kubernetes 1.7 (#1570) * Set externalTrafficPolicy and healthCheckNodePort * Rebase & address PR review * Remove duplicate fields * Final cleanup --- stable/nginx-ingress/Chart.yaml | 2 +- stable/nginx-ingress/templates/controller-service.yaml | 5 ++++- stable/nginx-ingress/values.yaml | 2 ++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/stable/nginx-ingress/Chart.yaml b/stable/nginx-ingress/Chart.yaml index 8095dd521c..b84a2b7822 100755 --- a/stable/nginx-ingress/Chart.yaml +++ b/stable/nginx-ingress/Chart.yaml @@ -1,5 +1,5 @@ name: nginx-ingress -version: 0.8.2 +version: 0.8.3 appVersion: 0.9.0-beta.12 description: An nginx Ingress controller that uses ConfigMap to store the nginx configuration. icon: https://upload.wikimedia.org/wikipedia/commons/thumb/c/c5/Nginx_logo.svg/500px-Nginx_logo.svg.png diff --git a/stable/nginx-ingress/templates/controller-service.yaml b/stable/nginx-ingress/templates/controller-service.yaml index 08c523dc50..e7131ea4ba 100644 --- a/stable/nginx-ingress/templates/controller-service.yaml +++ b/stable/nginx-ingress/templates/controller-service.yaml @@ -25,8 +25,11 @@ spec: loadBalancerSourceRanges: {{ toYaml .Values.controller.service.loadBalancerSourceRanges | indent 4 }} {{- end }} -{{- if .Values.controller.service.externalTrafficPolicy }} +{{- if and (ge .Capabilities.KubeVersion.Minor "7") (.Values.controller.service.externalTrafficPolicy) }} externalTrafficPolicy: "{{ .Values.controller.service.externalTrafficPolicy }}" +{{- end }} +{{- if and (ge .Capabilities.KubeVersion.Minor "7") (.Values.controller.service.healthCheckNodePort) }} + healthCheckNodePort: {{ .Values.controller.service.healthCheckNodePort }} {{- end }} ports: - name: http diff --git a/stable/nginx-ingress/values.yaml b/stable/nginx-ingress/values.yaml index 2eb937f88b..7b98d2d0cb 100644 --- a/stable/nginx-ingress/values.yaml +++ b/stable/nginx-ingress/values.yaml @@ -90,6 +90,8 @@ controller: ## Ref: https://kubernetes.io/docs/tutorials/services/source-ip/#source-ip-for-services-with-typeloadbalancer externalTrafficPolicy: "" + healthCheckNodePort: 0 + targetPorts: http: 80 https: 443