From a42bed8494b036a1df8620c5950154cb70068af8 Mon Sep 17 00:00:00 2001 From: Rafael Rios Saavedra Date: Tue, 14 Jan 2020 14:43:51 +0000 Subject: [PATCH 1/2] Adds maxmind key to download geolite2 database Signed-off-by: Rafael Rios Saavedra --- bitnami/nginx-ingress-controller/README.md | 1 + .../templates/controller-daemonset.yaml | 3 +++ .../templates/controller-deployment.yaml | 3 +++ bitnami/nginx-ingress-controller/values-production.yaml | 4 ++++ bitnami/nginx-ingress-controller/values.yaml | 4 ++++ 5 files changed, 15 insertions(+) diff --git a/bitnami/nginx-ingress-controller/README.md b/bitnami/nginx-ingress-controller/README.md index 76da2520e6..31cc7d524d 100644 --- a/bitnami/nginx-ingress-controller/README.md +++ b/bitnami/nginx-ingress-controller/README.md @@ -145,6 +145,7 @@ Parameter | Description | Default `configMapNamespace` | The nginx-configmap namespace name | `""` `tcpConfigMapNamespace` | The tcp-services-configmap namespace name | `""` `udpConfigMapNamespace` | The udp-services-configmap namespace name | `""` +`maxmindLicenseKey` | License key used to download GeoLite2 databases | `""` `defaultBackend.enabled` | If false, defaultBackendService must be provided | `true` `defaultBackend.name` | Name of the default backend component | `default-backend` `defaultBackend.image.repository` | Default backend container image repository | `k8s.gcr.io/defaultbackend` diff --git a/bitnami/nginx-ingress-controller/templates/controller-daemonset.yaml b/bitnami/nginx-ingress-controller/templates/controller-daemonset.yaml index 42352d65f1..7f890522c2 100644 --- a/bitnami/nginx-ingress-controller/templates/controller-daemonset.yaml +++ b/bitnami/nginx-ingress-controller/templates/controller-daemonset.yaml @@ -72,6 +72,9 @@ spec: {{- if .Values.scope.enabled }} - --watch-namespace={{ default .Release.Namespace .Values.scope.namespace }} {{- end }} + {{- if .Values.maxmindLicenseKey }} + - --maxmind-license-key={{ .Values.maxmindLicenseKey }} + {{- end }} {{- if and (.Values.reportNodeInternalIp) (.Values.hostNetwork)}} - --report-node-internal-ip-address={{ .Values.reportNodeInternalIp }} {{- end }} diff --git a/bitnami/nginx-ingress-controller/templates/controller-deployment.yaml b/bitnami/nginx-ingress-controller/templates/controller-deployment.yaml index 14ff0d20bc..1f9062057c 100644 --- a/bitnami/nginx-ingress-controller/templates/controller-deployment.yaml +++ b/bitnami/nginx-ingress-controller/templates/controller-deployment.yaml @@ -72,6 +72,9 @@ spec: {{- if .Values.scope.enabled }} - --watch-namespace={{ default .Release.Namespace .Values.scope.namespace }} {{- end }} + {{- if .Values.maxmindLicenseKey }} + - --maxmind-license-key={{ .Values.maxmindLicenseKey }} + {{- end }} {{- if and (.Values.reportNodeInternalIp) (.Values.hostNetwork) }} - --report-node-internal-ip-address={{ .Values.reportNodeInternalIp }} {{- end }} diff --git a/bitnami/nginx-ingress-controller/values-production.yaml b/bitnami/nginx-ingress-controller/values-production.yaml index b816a23ad2..1c9935a443 100644 --- a/bitnami/nginx-ingress-controller/values-production.yaml +++ b/bitnami/nginx-ingress-controller/values-production.yaml @@ -111,6 +111,10 @@ tcpConfigMapNamespace: "" ## udpConfigMapNamespace: "" +## License key used to download Geolite2 database +## +maxmindLicenseKey: "" + ## Additional command line arguments to pass to nginx-ingress-controller ## E.g. to specify the default SSL certificate you can use ## extraArgs: diff --git a/bitnami/nginx-ingress-controller/values.yaml b/bitnami/nginx-ingress-controller/values.yaml index f0c5f6d0d8..ebd308a4c1 100644 --- a/bitnami/nginx-ingress-controller/values.yaml +++ b/bitnami/nginx-ingress-controller/values.yaml @@ -111,6 +111,10 @@ tcpConfigMapNamespace: "" ## udpConfigMapNamespace: "" +## License key used to download Geolite2 database +## +maxmindLicenseKey: "" + ## Additional command line arguments to pass to nginx-ingress-controller ## E.g. to specify the default SSL certificate you can use ## extraArgs: From f055ac2afc85c96e0c9ce997614a5df5dac2ea80 Mon Sep 17 00:00:00 2001 From: Rafael Rios Saavedra Date: Tue, 14 Jan 2020 15:25:11 +0000 Subject: [PATCH 2/2] Change chart minor version. Adds note to README Signed-off-by: Rafael Rios Saavedra --- bitnami/nginx-ingress-controller/Chart.yaml | 2 +- bitnami/nginx-ingress-controller/README.md | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/bitnami/nginx-ingress-controller/Chart.yaml b/bitnami/nginx-ingress-controller/Chart.yaml index 8e21ac79a2..15605cb697 100644 --- a/bitnami/nginx-ingress-controller/Chart.yaml +++ b/bitnami/nginx-ingress-controller/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: nginx-ingress-controller -version: 5.2.2 +version: 5.3.0 appVersion: 0.26.2 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 31cc7d524d..233330a989 100644 --- a/bitnami/nginx-ingress-controller/README.md +++ b/bitnami/nginx-ingress-controller/README.md @@ -145,7 +145,7 @@ Parameter | Description | Default `configMapNamespace` | The nginx-configmap namespace name | `""` `tcpConfigMapNamespace` | The tcp-services-configmap namespace name | `""` `udpConfigMapNamespace` | The udp-services-configmap namespace name | `""` -`maxmindLicenseKey` | License key used to download GeoLite2 databases | `""` +`maxmindLicenseKey` | Maxmind license key to download GeoLite2 Databases. See [Accessing and using GeoLite2 database](https://blog.maxmind.com/2019/12/18/significant-changes-to-accessing-and-using-geolite2-databases/) | `""` `defaultBackend.enabled` | If false, defaultBackendService must be provided | `true` `defaultBackend.name` | Name of the default backend component | `default-backend` `defaultBackend.image.repository` | Default backend container image repository | `k8s.gcr.io/defaultbackend` @@ -217,6 +217,11 @@ This chart includes a `values-production.yaml` file where you can find some para - metrics.enabled: false + metrics.enabled: true ``` +## Notable changes + +### 5.3.0 + +In this version you can indicate the key to download the GeoLite2 databases using the [parameter](#parameters) `maxmindLicenseKey`. ## Upgrading