Merge pull request #1827 from rafariossaa/geolite2_fix

[bitnami/nginx-ingress-controller] GeoLite2 database download

bitnami/nginx-ingress-controller/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v1
 name: nginx-ingress-controller
-version: 5.2.3
+version: 5.3.0
 appVersion: 0.27.1
 description: Chart for the nginx Ingress controller
 keywords:

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` | 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`
@@ -216,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
 

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 }}

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 }}

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:

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: