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

Add geoip2 module and DB to nginx build #2559

Merged
merged 2 commits into from
Jun 8, 2018

Conversation

glennslaven
Copy link
Contributor

@glennslaven glennslaven commented May 24, 2018

What this PR does / why we need it:
MaxMind is deprecating their legacy databases, updates for them will no longer be available after 2019-01-02. See https://support.maxmind.com/geolite-legacy-discontinuation-notice/

This adds support for the GeoLite2 databases https://dev.maxmind.com/geoip/geoip2/geolite2/ via https://github.com/leev/ngx_http_geoip2_module.

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

Special notes for your reviewer:
Adds the City & ASN GeoLite2 databases, subsequent PR will update the ingress controller and template

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels May 24, 2018
@aledbf
Copy link
Member

aledbf commented May 24, 2018

@glennslaven please increase the TAG variable in the images/nginx/Makefile version

@glennslaven
Copy link
Contributor Author

@aledbf Should that tag match the tag in the root Makefile where it sets the BASEIMAGE?

@aledbf
Copy link
Member

aledbf commented May 24, 2018

Should that tag match the tag in the root Makefile where it sets the BASEIMAGE?

No, only to the Makefile in the nginx directory. This is because the image is not built and publish by travis, is a manual process after we merge this PR. Then we can update the main Makefile

@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jun 5, 2018
@aledbf
Copy link
Member

aledbf commented Jun 5, 2018

@glennslaven please rebase

@glennslaven glennslaven force-pushed the geoip2-nginx-image branch from 527ee88 to 2fa5390 Compare June 8, 2018 06:55
@codecov-io
Copy link

Codecov Report

Merging #2559 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #2559   +/-   ##
=======================================
  Coverage   40.68%   40.68%           
=======================================
  Files          75       75           
  Lines        5108     5108           
=======================================
  Hits         2078     2078           
  Misses       2751     2751           
  Partials      279      279

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 3b0d225...2fa5390. Read the comment docs.

@aledbf
Copy link
Member

aledbf commented Jun 8, 2018

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 8, 2018
@aledbf
Copy link
Member

aledbf commented Jun 8, 2018

@glennslaven thanks!

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: aledbf, glennslaven

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 Jun 8, 2018
@k8s-ci-robot k8s-ci-robot merged commit 34430bc into kubernetes:master Jun 8, 2018
@glennslaven glennslaven deleted the geoip2-nginx-image branch June 12, 2018 01:43
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. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Support MaxMind GeoIP2
4 participants