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.

Sign up for GitHub

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

Jump to bottom

Add CustomHTTPErrors directive #11699

Merged
merged 2 commits into from
Jul 31, 2024
Merged

Add CustomHTTPErrors directive #11699

merged 2 commits into from
Jul 31, 2024

Conversation

MrErlison
Copy link
Member

What this PR does / why we need it:

Add CustomHTTPErrors directive, test and status

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

How Has This Been Tested?

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.

/cc @rikatz

@k8s-ci-robot k8s-ci-robot requested a review from rikatz July 29, 2024 12:54
@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 Jul 29, 2024
@k8s-ci-robot
Copy link
Contributor

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-sigs/prow repository.

@k8s-ci-robot k8s-ci-robot added needs-kind Indicates a PR lacks a `kind/foo` label and requires one. needs-priority size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jul 29, 2024
rikatz
rikatz reviewed Jul 31, 2024
View reviewed changes
internal/ingress/controller/template/crossplane/crossplane_test.go Outdated
@@ -186,6 +186,8 @@ func TestCrossplaneTemplate(t *testing.T) {
tplConfig.Cfg.UpstreamKeepaliveTimeout = 200
tplConfig.Cfg.UpstreamKeepaliveRequests = 15

tplConfig.Cfg.CustomHTTPErrors = []int{400, 404, 501}
Copy link
Contributor

Choose a reason for hiding this comment

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

On the upstream branch, https://github.com/kubernetes/ingress-nginx/blob/feature-go-crossplane/internal/ingress/controller/template/crossplane/crossplane_test.go#L164 exists.

You probably need to rebase and remove this line, and keep just your custom http errors (400, 404, etc)

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 didn't see that the test existed. I prefer to keep the original.

@rikatz
Copy link
Contributor

rikatz commented Jul 31, 2024

/approve
/hold
Will wait for the fixes on the suggested changes.

@k8s-ci-robot k8s-ci-robot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Jul 31, 2024
@rikatz
Copy link
Contributor

rikatz commented Jul 31, 2024

/lgtm
/hold cancel
Thanks!

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 31, 2024
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 31, 2024
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: MrErlison, rikatz

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 merged commit 3a93c9d into kubernetes:feature-go-crossplane Jul 31, 2024
45 checks passed
rikatz pushed a commit that referenced this pull request Sep 10, 2024
@MrErlison @rikatz
Add CustomHTTPErrors directive (#11699)
c5d2a22 
* Add CustomHTTPErrors directive

* Fix: Add missing '=' in error_page directive
rikatz pushed a commit that referenced this pull request Sep 15, 2024
@MrErlison @rikatz
Add CustomHTTPErrors directive (#11699)
7d0dd66 
* Add CustomHTTPErrors directive

* Fix: Add missing '=' in error_page directive
rikatz pushed a commit to rikatz/ingress-nginx that referenced this pull request Sep 29, 2024
@MrErlison @rikatz
Add CustomHTTPErrors directive (kubernetes#11699)
26770f6 
* Add CustomHTTPErrors directive

* Fix: Add missing '=' in error_page directive
rikatz pushed a commit that referenced this pull request Sep 29, 2024
@MrErlison @rikatz
Add CustomHTTPErrors directive (#11699)
41db061 
* Add CustomHTTPErrors directive

* Fix: Add missing '=' in error_page directive
rikatz pushed a commit that referenced this pull request Oct 3, 2024
@MrErlison @rikatz
Add CustomHTTPErrors directive (#11699)
ddd5952 
* Add CustomHTTPErrors directive

* Fix: Add missing '=' in error_page directive
rikatz pushed a commit to rikatz/ingress-nginx that referenced this pull request Oct 3, 2024
@MrErlison @rikatz
Add CustomHTTPErrors directive (kubernetes#11699)
a92861f 
* Add CustomHTTPErrors directive

* Fix: Add missing '=' in error_page directive
rikatz pushed a commit to rikatz/ingress-nginx that referenced this pull request Oct 28, 2024
@MrErlison @rikatz
Add CustomHTTPErrors directive (kubernetes#11699)
27dfcff 
* Add CustomHTTPErrors directive

* Fix: Add missing '=' in error_page directive
rikatz pushed a commit to rikatz/ingress-nginx that referenced this pull request Nov 5, 2024
@MrErlison @rikatz
Add CustomHTTPErrors directive (kubernetes#11699)
1e9384b 
* Add CustomHTTPErrors directive

* Fix: Add missing '=' in error_page directive
rikatz pushed a commit to rikatz/ingress-nginx that referenced this pull request Nov 11, 2024
@MrErlison @rikatz
Add CustomHTTPErrors directive (kubernetes#11699)
5f5b240 
* Add CustomHTTPErrors directive

* Fix: Add missing '=' in error_page directive
rikatz pushed a commit to rikatz/ingress-nginx that referenced this pull request Nov 13, 2024
@MrErlison @rikatz
Add CustomHTTPErrors directive (kubernetes#11699)
565f457 
* Add CustomHTTPErrors directive

* Fix: Add missing '=' in error_page directive
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rikatz rikatz rikatz left review comments

Assignees

@rikatz rikatz

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. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@MrErlison @k8s-ci-robot @rikatz