From 21cc0c81c0ca658b6af615be4b47c800856e9629 Mon Sep 17 00:00:00 2001 From: "Javier J. Salmeron Garcia" Date: Wed, 23 Jan 2019 17:11:09 +0100 Subject: [PATCH 1/3] [bitnami/nginx-ingress-controller] Use geoip2 by default --- bitnami/nginx-ingress-controller/Chart.yaml | 2 +- bitnami/nginx-ingress-controller/README.md | 2 +- bitnami/nginx-ingress-controller/values-production.yaml | 5 ++++- bitnami/nginx-ingress-controller/values.yaml | 4 +++- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/bitnami/nginx-ingress-controller/Chart.yaml b/bitnami/nginx-ingress-controller/Chart.yaml index b126a7ec3..c4baa8806 100644 --- a/bitnami/nginx-ingress-controller/Chart.yaml +++ b/bitnami/nginx-ingress-controller/Chart.yaml @@ -1,5 +1,5 @@ name: nginx-ingress-controller -version: 3.1.2 +version: 3.1.3 appVersion: 0.21.0 description: Chart for the nginx Ingress controller keywords: diff --git a/bitnami/nginx-ingress-controller/README.md b/bitnami/nginx-ingress-controller/README.md index cda46236d..5b5ec38b4 100644 --- a/bitnami/nginx-ingress-controller/README.md +++ b/bitnami/nginx-ingress-controller/README.md @@ -54,7 +54,7 @@ Parameter | Description | Default `image.repository` | controller container image repository | `bitnami/nginx-ingress-controller` `image.tag` | controller container image tag | `{VERSION}` `image.pullPolicy` | controller container image pull policy | `IfNotPresent` -`config` | nginx ConfigMap entries | `nil` +`config` | nginx ConfigMap entries | `use-geoip: "false", use-geoip2: "true"` `hostNetwork` | If the nginx deployment / daemonset should run on the host's network namespace. Do not set this when `controller.service.externalIPs` is set and `kube-proxy` is used as there will be a port-conflict for port `80` | false `defaultBackendService` | default 404 backend service; required only if `defaultBackend.enabled = false` | `""` `electionID` | election ID to use for the status update | `ingress-controller-leader` diff --git a/bitnami/nginx-ingress-controller/values-production.yaml b/bitnami/nginx-ingress-controller/values-production.yaml index 1f9c97c84..c7303c8fb 100644 --- a/bitnami/nginx-ingress-controller/values-production.yaml +++ b/bitnami/nginx-ingress-controller/values-production.yaml @@ -11,7 +11,10 @@ image: ## pullPolicy: IfNotPresent -config: {} +config: + use-geoip: "false" + use-geoip2: "true" + # Will add custom header to Nginx https://github.com/kubernetes/ingress-nginx/tree/master/docs/examples/customization/custom-headers headers: {} diff --git a/bitnami/nginx-ingress-controller/values.yaml b/bitnami/nginx-ingress-controller/values.yaml index 7bdbbf690..e40007e9a 100644 --- a/bitnami/nginx-ingress-controller/values.yaml +++ b/bitnami/nginx-ingress-controller/values.yaml @@ -17,7 +17,9 @@ image: ## pullPolicy: IfNotPresent -config: {} +config: + use-geoip: "false" + use-geoip2: "true" # Will add custom header to Nginx https://github.com/kubernetes/ingress-nginx/tree/master/docs/examples/customization/custom-headers headers: {} From 05478fcb380396b8e992012fd9bb1b28d057e34f Mon Sep 17 00:00:00 2001 From: "Javier J. Salmeron Garcia" Date: Wed, 23 Jan 2019 17:16:40 +0100 Subject: [PATCH 2/3] Bump version to major --- bitnami/nginx-ingress-controller/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bitnami/nginx-ingress-controller/Chart.yaml b/bitnami/nginx-ingress-controller/Chart.yaml index c4baa8806..ce5c86797 100644 --- a/bitnami/nginx-ingress-controller/Chart.yaml +++ b/bitnami/nginx-ingress-controller/Chart.yaml @@ -1,5 +1,5 @@ name: nginx-ingress-controller -version: 3.1.3 +version: 4.0.0 appVersion: 0.21.0 description: Chart for the nginx Ingress controller keywords: From 84da6fe1edf4b2b8dfbf174bfe055ba6490ba1f3 Mon Sep 17 00:00:00 2001 From: "Javier J. Salmeron Garcia" Date: Wed, 23 Jan 2019 17:17:45 +0100 Subject: [PATCH 3/3] Revert bump --- bitnami/nginx-ingress-controller/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bitnami/nginx-ingress-controller/Chart.yaml b/bitnami/nginx-ingress-controller/Chart.yaml index ce5c86797..c4baa8806 100644 --- a/bitnami/nginx-ingress-controller/Chart.yaml +++ b/bitnami/nginx-ingress-controller/Chart.yaml @@ -1,5 +1,5 @@ name: nginx-ingress-controller -version: 4.0.0 +version: 3.1.3 appVersion: 0.21.0 description: Chart for the nginx Ingress controller keywords: