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 geoname id value into $geoip2_*_geoname_id variables #9527

Merged
merged 1 commit into from
May 8, 2023

Conversation

Rakoth
Copy link
Contributor

@Rakoth Rakoth commented Jan 20, 2023

What this PR does / why we need it:

This PR adds geoip2 variables

  • $geoip2_city_geoname_id,
  • $geoip2_subregion_geoname_id
  • $geoip2_region_geoname_id
  • $geoip2_city_country_geoname_id
  • $geoip2_country_geoname_id
  • $geoip2_continent_geoname_id

with geoname ids information according to a source ip. Applications may get this value from nginx controller directly instead of using another geoip2 request.

How Has This Been Tested?

Tested locally

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • CVE Report (Scanner found CVE and adding report)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Documentation only

Checklist:

  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I've read the CONTRIBUTION guide
  • I have added unit and/or e2e tests to cover my changes.
  • All new and existing tests passed.
  • Added Release Notes.
Adding geoname ids geoip variables

@linux-foundation-easycla
Copy link

linux-foundation-easycla bot commented Jan 20, 2023

CLA Signed

The committers listed above are authorized under a signed CLA.

  • ✅ login: Rakoth / name: Alexander Stanko (e9d5e0a)

@k8s-ci-robot k8s-ci-robot added the needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. label Jan 20, 2023
@k8s-ci-robot
Copy link
Contributor

@Rakoth: This issue is currently awaiting triage.

If Ingress contributors determines this is a relevant issue, they will accept it by applying the triage/accepted label and provide further guidance.

The triage/accepted label can be added by org members by writing /triage accepted in a comment.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-ci-robot k8s-ci-robot added cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. needs-kind Indicates a PR lacks a `kind/foo` label and requires one. labels Jan 20, 2023
@k8s-ci-robot
Copy link
Contributor

Hi @Rakoth. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-ci-robot
Copy link
Contributor

Welcome @Rakoth!

It looks like this is your first PR to kubernetes/ingress-nginx 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes/ingress-nginx has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. and removed cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. labels Jan 20, 2023
@Rakoth
Copy link
Contributor Author

Rakoth commented Jan 31, 2023

Hello @rikatz! Any chance you can review this small change soon?

@foxdalas
Copy link
Contributor

foxdalas commented Feb 7, 2023

@aledbf Hi! Maybe you can help with review?

@tao12345666333
Copy link
Member

/assign

I will add this to my list.

Copy link
Member

@tao12345666333 tao12345666333 left a comment

Choose a reason for hiding this comment

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

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Feb 17, 2023
@tao12345666333
Copy link
Member

Can you provide steps to reproduce? I need to make sure it doesn't have other effects.

@Rakoth
Copy link
Contributor Author

Rakoth commented Feb 17, 2023

Can you provide steps to reproduce? I need to make sure it doesn't have other effects.

Hello @tao12345666333 ! Thanks for your response!

We start ingress controller with following arguments

    --configmap=ingress/ingress-nginx-controller
    --maxmind-mirror=http://some.mirror.geoip.io
    --maxmind-edition-ids=GeoIP2-City,GeoIP2-Country,GeoIP2-ISP

and ingress/ingress-nginx-controller config map has proxy-set-headers option, which points to another config map ingress/custom-headers:

data:
  X-GeoIP2-City-Geoname-ID: $geoip2_city_geoname_id
  X-GeoIP2-Subregion-Geoname-ID: $geoip2_subregion_geoname_id
  X-GeoIP2-Region-Geoname-ID: $geoip2_region_geoname_id
  X-GeoIP2-City-Country-Geoname-ID: $geoip2_city_country_geoname_id
  X-GeoIP2-Country-Geoname-ID: $geoip2_country_geoname_id
  X-GeoIP2-Continent-Geoname-ID: $geoip2_continent_geoname_id
  X-GeoIP2-City: $geoip2_city
  X-GeoIP2-Country-Code: $geoip2_city_country_code
  X-GeoIP2-DMA-Code: $geoip2_dma_code
  X-GeoIP2-ISP: $geoip2_isp
  X-GeoIP2-Latitude: $normalize_geoip2_latitude
  X-GeoIP2-Longitude: $normalize_geoip2_longitude
  X-GeoIP2-Postal-Code: $geoip2_postal_code
  X-GeoIP2-Region-Code: $geoip2_region_code
  X-GeoIP2-Region-Name: $geoip2_region_name
  X-GeoIP2-Time-Zone: $geoip2_time_zone

And the final step is our application, which reads this request headers

@Rakoth
Copy link
Contributor Author

Rakoth commented Mar 7, 2023

@tao12345666333 Hi! Is there any actions needed from my side to proceed forward with this PR?

@Rakoth Rakoth requested review from tao12345666333 and removed request for rikatz March 16, 2023 06:17
@Rakoth
Copy link
Contributor Author

Rakoth commented Mar 29, 2023

@tao12345666333 Could you help with this PR please?

Copy link
Member

@tao12345666333 tao12345666333 left a comment

Choose a reason for hiding this comment

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

Sorry for the long delay.
I don't think this modification will cause any additional issues.

/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 May 8, 2023
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Rakoth, tao12345666333

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 May 8, 2023
@k8s-ci-robot k8s-ci-robot merged commit 2794129 into kubernetes:main May 8, 2023
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. needs-kind Indicates a PR lacks a `kind/foo` label and requires one. needs-priority needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. 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.

None yet

4 participants