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 feature toggle for custom error pages /metrics #10984

Open
wants to merge 16 commits into
base: main
Choose a base branch
from

Conversation

ricardoapl
Copy link
Member

@ricardoapl ricardoapl commented Feb 14, 2024

What this PR does / why we need it:

Adds feature toggle to expose /metrics and /debug/vars endpoints from custom error pages default backend

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

Which issue/s this PR fixes

Fixes #9152

How Has This Been Tested?

Tested manually on local machine by running the binary with different environment variable combinations such as

ERROR_FILES_PATH=./www ./app

curl --include 127.0.0.1:8080/
HTTP/1.1 404 Not Found
Content-Type: text/html
Date: Fri, 16 Feb 2024 11:29:18 GMT
Content-Length: 60

<span>The page you're looking for could not be found.</span>

curl --include 127.0.0.1:8080/metrics
HTTP/1.1 200 OK
Content-Type: text/plain; version=0.0.4; charset=utf-8
Date: Fri, 16 Feb 2024 11:30:10 GMT
Transfer-Encoding: chunked

# HELP default_http_backend_http_request_count_total Counter of HTTP requests made.
# TYPE default_http_backend_http_request_count_total counter
default_http_backend_http_request_count_total{proto="1.1"} 8
...

curl --include 127.0.0.1:8080/debug/vars
HTTP/1.1 200 OK
Content-Type: application/json; charset=utf-8
Date: Fri, 16 Feb 2024 11:31:25 GMT
Transfer-Encoding: chunked

{
"cmdline": ["./app"],
...
METRICS_PORT=8081 ERROR_FILES_PATH=./www ./app

curl --include 127.0.0.1:8080/
HTTP/1.1 404 Not Found
Content-Type: text/html
Date: Fri, 16 Feb 2024 11:33:09 GMT
Content-Length: 60

<span>The page you're looking for could not be found.</span>

curl --include 127.0.0.1:8080/metrics
HTTP/1.1 404 Not Found
Content-Type: text/html
Date: Fri, 16 Feb 2024 11:33:55 GMT
Content-Length: 60

<span>The page you're looking for could not be found.</span>

curl --include 127.0.0.1:8081/metrics
HTTP/1.1 200 OK
Content-Type: text/plain; version=0.0.4; charset=utf-8
Date: Fri, 16 Feb 2024 11:34:21 GMT
Transfer-Encoding: chunked

# HELP default_http_backend_http_request_count_total Counter of HTTP requests made.
# TYPE default_http_backend_http_request_count_total counter
...
IS_EXPORT_METRICS=false METRICS_PORT=8081 ERROR_FILES_PATH=./www ./app

curl --include 127.0.0.1:8080/        
HTTP/1.1 404 Not Found
Content-Type: text/html
Date: Fri, 16 Feb 2024 11:37:37 GMT
Content-Length: 60

<span>The page you're looking for could not be found.</span>

curl --include 127.0.0.1:8080/metrics
HTTP/1.1 404 Not Found
Content-Type: text/html
Date: Fri, 16 Feb 2024 11:37:49 GMT
Content-Length: 60

<span>The page you're looking for could not be found.

curl --include 127.0.0.1:8080/debug/vars
HTTP/1.1 404 Not Found
Content-Type: text/html
Date: Fri, 16 Feb 2024 11:40:47 GMT
Content-Length: 60

<span>The page you're looking for could not be found.</span>

curl --include 127.0.0.1:8081/metrics
curl: (7) Failed to connect to 127.0.0.1 port 8081 after 0 ms: Couldn't connect to server

curl --include 127.0.0.1:8081/debug/vars
curl: (7) Failed to connect to 127.0.0.1 port 8081 after 0 ms: Couldn't connect to server
IS_EXPORT_METRICS=false ERROR_FILES_PATH=./www ./app

curl --include 127.0.0.1:8080/       
HTTP/1.1 404 Not Found
Content-Type: text/html
Date: Fri, 16 Feb 2024 11:39:42 GMT
Content-Length: 60

<span>The page you're looking for could not be found.</span>

curl --include 127.0.0.1:8080/metrics
HTTP/1.1 404 Not Found
Content-Type: text/html
Date: Fri, 16 Feb 2024 11:39:59 GMT
Content-Length: 60

<span>The page you're looking for could not be found.</span>

curl --include 127.0.0.1:8080/debug/vars
HTTP/1.1 404 Not Found
Content-Type: text/html
Date: Fri, 16 Feb 2024 11:40:09 GMT
Content-Length: 60

<span>The page you're looking for could not be found.</span>

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.

@k8s-ci-robot k8s-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Feb 14, 2024
Copy link

netlify bot commented Feb 14, 2024

Deploy Preview for kubernetes-ingress-nginx canceled.

Name Link
🔨 Latest commit 9781d2b
🔍 Latest deploy log https://app.netlify.com/sites/kubernetes-ingress-nginx/deploys/675ffcef58287b000851926d

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Feb 14, 2024
@k8s-ci-robot
Copy link
Contributor

Welcome @ricardoapl!

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 needs-kind Indicates a PR lacks a `kind/foo` label and requires one. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Feb 14, 2024
@k8s-ci-robot
Copy link
Contributor

Hi @ricardoapl. 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 k8s-ci-robot added needs-priority size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Feb 14, 2024
@ricardoapl
Copy link
Member Author

This is still missing changes to the Helm chart, but I would really appreciate some feedback before the implementation is complete

@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. area/helm Issues or PRs related to helm charts and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Feb 15, 2024
@ricardoapl ricardoapl changed the title [WIP] Add feature toggle for custom error pages /metrics Add feature toggle for custom error pages /metrics Feb 16, 2024
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Feb 16, 2024
@ricardoapl
Copy link
Member Author

/assign @tao12345666333

@tao12345666333
Copy link
Member

/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 Mar 14, 2024
@ricardoapl
Copy link
Member Author

@tao12345666333 @strongjz please take another look, I believe I have resolved all of the issues

@tao12345666333
Copy link
Member

Thanks! I will have a test today.

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: ricardoapl
Once this PR has been reviewed and has the lgtm label, please ask for approval from tao12345666333. For more information see the Kubernetes Code Review Process.

The full list of commands accepted by this bot can be found 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 needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 13, 2024
@ricardoapl ricardoapl force-pushed the custom-error-pages-toggle branch from 4e69af7 to 86e89ed Compare May 14, 2024 09:17
@k8s-ci-robot k8s-ci-robot added triage/accepted Indicates an issue or PR is ready to be actively worked on. priority/backlog Higher priority than priority/awaiting-more-evidence. and removed needs-kind Indicates a PR lacks a `kind/foo` label and requires one. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. needs-priority labels Dec 13, 2024
@strongjz strongjz requested review from tao12345666333 and Gacko and removed request for puerco and cpanato December 13, 2024 16:17
Copy link
Member

@Gacko Gacko left a comment

Choose a reason for hiding this comment

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

I basically like the idea, but it's changing a lot of stuff in places it shouldn't.

Please first make sure you rebased correctly as you're currently re-adding stuff we already removed some time ago.

images/Makefile Outdated
PLATFORMS?=linux/amd64,linux/arm,linux/arm64
OUTPUT=
PROGRESS=plain
BUILDX_PLATFORMS ?= linux/amd64,linux/arm,linux/arm64,linux/s390x
Copy link
Member

Choose a reason for hiding this comment

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

We have dropped s390x. I think you rebased your PR wrongly.

Copy link
Member Author

Choose a reason for hiding this comment

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

Should be resolved with 9781d2b

Signed-off-by: Ricardo Lopes <[email protected]>
Signed-off-by: Ricardo Lopes <[email protected]>
Signed-off-by: Ricardo Lopes <[email protected]>
Signed-off-by: Ricardo Lopes <[email protected]>
Signed-off-by: Ricardo Lopes <[email protected]>
@ricardoapl ricardoapl force-pushed the custom-error-pages-toggle branch from 82c6e42 to 077675d Compare December 16, 2024 09:58
Signed-off-by: Ricardo Lopes <[email protected]>
@ricardoapl ricardoapl force-pushed the custom-error-pages-toggle branch from 077675d to 9781d2b Compare December 16, 2024 10:11
@ricardoapl
Copy link
Member Author

Thank you for taking the time to look at this @Gacko, I really appreciate it

I basically like the idea, but it's changing a lot of stuff in places it shouldn't.

Can you please share an example or two of where this is happening?

Please first make sure you rebased correctly as you're currently re-adding stuff we already removed some time ago.

I believe I've resolved this with 9781d2b, let me know if I missed anything

@ricardoapl ricardoapl requested a review from Gacko December 16, 2024 11:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/docs area/helm Issues or PRs related to helm charts cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/feature Categorizes issue or PR as related to a new feature. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. priority/backlog Higher priority than priority/awaiting-more-evidence. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

custom-error-pages: Add an ability to disable "/metrics", "/healthz" and "/debug/vars" endpoints
9 participants