Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable download of GeoLite2 databases #4896

Merged
merged 1 commit into from
Jan 8, 2020
Merged

Conversation

aledbf
Copy link
Member

@aledbf aledbf commented Jan 7, 2020

What this PR does / why we need it:

Which issue this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close that issue when PR gets merged): fixes #4881

Special notes for your reviewer:

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jan 7, 2020
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: aledbf

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 7, 2020
@codecov-io
Copy link

Codecov Report

Merging #4896 into master will decrease coverage by 0.05%.
The diff coverage is 20%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #4896      +/-   ##
==========================================
- Coverage    58.5%   58.44%   -0.06%     
==========================================
  Files          88       88              
  Lines        6719     6729      +10     
==========================================
+ Hits         3931     3933       +2     
- Misses       2359     2365       +6     
- Partials      429      431       +2
Impacted Files Coverage Δ
internal/ingress/controller/store/store.go 57.88% <0%> (-0.38%) ⬇️
cmd/nginx/flags.go 83.85% <28.57%> (-2.1%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update e093130...7d7a860. Read the comment docs.

@aledbf
Copy link
Member Author

aledbf commented Jan 7, 2020

/retest

3 similar comments
@aledbf
Copy link
Member Author

aledbf commented Jan 8, 2020

/retest

@aledbf
Copy link
Member Author

aledbf commented Jan 8, 2020

/retest

@aledbf
Copy link
Member Author

aledbf commented Jan 8, 2020

/retest

@aledbf aledbf merged commit 74944b9 into kubernetes:master Jan 8, 2020
@aledbf aledbf deleted the geopipdb branch January 9, 2020 00:53
kushal-kumaran pushed a commit to VeritasOS/ingress-nginx that referenced this pull request Jan 23, 2020
This patch cherrypicks the commit
74944b9 to allow building without the
maxmind geoip2 database.
geoIPPath = "/etc/nginx/geoip"

geoLiteCityDB = "GeoLite2-City"
geoLiteASNDB = "GeoLite2-ASN"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Commercial GeoIP2 databases are more accurate than GeoLite2 ones. We use GeoIP2-ISP instead of GeoLite2-ASN. So with this design I had to create a placeholder GeoLite2-ASN.mmdb file to trick the controller into believing this file exist so that it does not force disable use-geoip2 setting.

I think instead of this the controller should get the comma separated list of DB file names as a command line arrgument and then check for existence of them.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should be more dramatic than that. Right now those files are present in the docker image and are thirteen months old. The old geoip module databases are not maintained anymore.
Before any change, I think we should consider drop support for the old geoip module.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add flag to download of GeoIP databases
4 participants