Skip to content

Commit 8b20427

Browse files
authored
Update maxmind post link about geolite2 license changes (#11861)
Signed-off-by: Seonghyeon Cho <seonghyeoncho96@gmail.com>
1 parent 21cd966 commit 8b20427

File tree

6 files changed

+6
-6
lines changed

6 files changed

+6
-6
lines changed

Changelog.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2057,7 +2057,7 @@ _Breaking Changes:_
20572057

20582058
```
20592059
Due to upcoming data privacy regulations, we are making significant changes to how you access free GeoLite2 databases starting December 30, 2019.
2060-
Learn more on our blog https://blog.maxmind.com/2019/12/18/significant-changes-to-accessing-and-using-geolite2-databases/
2060+
Learn more on our blog https://blog.maxmind.com/2019/12/significant-changes-to-accessing-and-using-geolite2-databases/
20612061
```
20622062

20632063
Because of this change, it is not clear we can provide the databases directly from the docker image.

charts/ingress-nginx/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ As of version `1.26.0` of this chart, by simply not providing any clusterIP valu
367367
| controller.livenessProbe.periodSeconds | int | `10` | |
368368
| controller.livenessProbe.successThreshold | int | `1` | |
369369
| controller.livenessProbe.timeoutSeconds | int | `1` | |
370-
| controller.maxmindLicenseKey | string | `""` | Maxmind license key to download GeoLite2 Databases. # https://blog.maxmind.com/2019/12/18/significant-changes-to-accessing-and-using-geolite2-databases |
370+
| controller.maxmindLicenseKey | string | `""` | Maxmind license key to download GeoLite2 Databases. # https://blog.maxmind.com/2019/12/significant-changes-to-accessing-and-using-geolite2-databases/ |
371371
| controller.metrics.enabled | bool | `false` | |
372372
| controller.metrics.port | int | `10254` | |
373373
| controller.metrics.portName | string | `"metrics"` | |

charts/ingress-nginx/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ controller:
198198
# -- Annotations to be added to the udp config configmap
199199
annotations: {}
200200
# -- Maxmind license key to download GeoLite2 Databases.
201-
## https://blog.maxmind.com/2019/12/18/significant-changes-to-accessing-and-using-geolite2-databases
201+
## https://blog.maxmind.com/2019/12/significant-changes-to-accessing-and-using-geolite2-databases/
202202
maxmindLicenseKey: ""
203203
# -- Additional command line arguments to pass to Ingress-Nginx Controller
204204
# E.g. to specify the default SSL certificate you can use

docs/user-guide/cli-arguments.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ They are set in the container spec of the `ingress-nginx-controller` Deployment
4545
| `--maxmind-edition-ids` | Maxmind edition ids to download GeoLite2 Databases. (default "GeoLite2-City,GeoLite2-ASN") |
4646
| `--maxmind-retries-timeout` | Maxmind downloading delay between 1st and 2nd attempt, 0s - do not retry to download if something went wrong. (default 0s) |
4747
| `--maxmind-retries-count` | Number of attempts to download the GeoIP DB. (default 1) |
48-
| `--maxmind-license-key` | Maxmind license key to download GeoLite2 Databases. https://blog.maxmind.com/2019/12/18/significant-changes-to-accessing-and-using-geolite2-databases . |
48+
| `--maxmind-license-key` | Maxmind license key to download GeoLite2 Databases. https://blog.maxmind.com/2019/12/significant-changes-to-accessing-and-using-geolite2-databases/ . |
4949
| `--maxmind-mirror` | Maxmind mirror url (example: http://geoip.local/databases. |
5050
| `--metrics-per-host` | Export metrics per-host. (default true) |
5151
| `--monitor-max-batch-size` | Max batch size of NGINX metrics. (default 10000)|

docs/user-guide/nginx-configuration/configmap.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -714,7 +714,7 @@ _**default:**_ true
714714
## use-geoip2
715715

716716
Enables the [geoip2 module](https://github.com/leev/ngx_http_geoip2_module) for NGINX.
717-
Since `0.27.0` and due to a [change in the MaxMind databases](https://blog.maxmind.com/2019/12/18/significant-changes-to-accessing-and-using-geolite2-databases) a license is required to have access to the databases.
717+
Since `0.27.0` and due to a [change in the MaxMind databases](https://blog.maxmind.com/2019/12/significant-changes-to-accessing-and-using-geolite2-databases/) a license is required to have access to the databases.
718718
For this reason, it is required to define a new flag `--maxmind-license-key` in the ingress controller deployment to download the databases needed during the initialization of the ingress controller.
719719
Alternatively, it is possible to use a volume to mount the files `/etc/ingress-controller/geoip/GeoLite2-City.mmdb` and `/etc/ingress-controller/geoip/GeoLite2-ASN.mmdb`, avoiding the overhead of the download.
720720

pkg/flags/flags.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ Takes the form "<host>:port". If not provided, no admission controller is starte
234234

235235
flags.StringVar(&nginx.MaxmindMirror, "maxmind-mirror", "", `Maxmind mirror url (example: http://geoip.local/databases.`)
236236
flags.StringVar(&nginx.MaxmindLicenseKey, "maxmind-license-key", "", `Maxmind license key to download GeoLite2 Databases.
237-
https://blog.maxmind.com/2019/12/18/significant-changes-to-accessing-and-using-geolite2-databases .`)
237+
https://blog.maxmind.com/2019/12/significant-changes-to-accessing-and-using-geolite2-databases/ .`)
238238
flags.StringVar(&nginx.MaxmindEditionIDs, "maxmind-edition-ids", "GeoLite2-City,GeoLite2-ASN", `Maxmind edition ids to download GeoLite2 Databases.`)
239239
flags.IntVar(&nginx.MaxmindRetriesCount, "maxmind-retries-count", 1, "Number of attempts to download the GeoIP DB.")
240240
flags.DurationVar(&nginx.MaxmindRetriesTimeout, "maxmind-retries-timeout", time.Second*0, "Maxmind downloading delay between 1st and 2nd attempt, 0s - do not retry to download if something went wrong.")

0 commit comments

Comments
 (0)