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

simplify customhttperrors e2e test and add regression test and fix a bug #3765

Merged
merged 2 commits into from
Feb 14, 2019
Merged

simplify customhttperrors e2e test and add regression test and fix a bug #3765

merged 2 commits into from
Feb 14, 2019

Conversation

ElvinEfendi
Copy link
Member

What this PR does / why we need it:
Currently when custom-http-errors annotation change, Nginx configuration won't be regenerated. The PR fixes the bug, includes respective regression test and also simplifies the whole test file to not deploy and delete ingress-nginx instance for every case.

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

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/M Denotes a PR that changes 30-99 lines, ignoring generated files. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Feb 14, 2019
@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Feb 14, 2019
for i, codeSet := range errorCodes {
annotations := map[string]string{
"nginx.ingress.kubernetes.io/custom-http-errors": strings.Join(codeSet, ","),
By("updating configuration when only custom-http-error value changes")
Copy link
Member Author

Choose a reason for hiding this comment

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

This is the regression test covering bug.

@aledbf
Copy link
Member

aledbf commented Feb 14, 2019

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 14, 2019
@ElvinEfendi
Copy link
Member Author

ElvinEfendi commented Feb 14, 2019

/hold

@aledbf I've not pushed the fix yet :) Wanted to make sure e2e test fails without it.

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 14, 2019
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 14, 2019
@ElvinEfendi
Copy link
Member Author

/hold cancel

@aledbf now it's ready.

@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 Feb 14, 2019
@ElvinEfendi
Copy link
Member Author

cc @jasongwartz

@aledbf
Copy link
Member

aledbf commented Feb 14, 2019

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 14, 2019
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

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

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 b72dfa9 into kubernetes:master Feb 14, 2019

ing := framework.NewSingleIngress(host, "/test", host, f.IngressController.Namespace, "http-svc", 80, &annotations)
f.EnsureIngress(ing)
By("turning on proxy_intercept_errors directive")
Copy link
Contributor

Choose a reason for hiding this comment

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

Didn't know about this test format, much cleaner

@jasongwartz
Copy link
Contributor

@ElvinEfendi It's possible I've seen this behaviour but I wouldn't have known where to fix it. thanks!

@ElvinEfendi ElvinEfendi deleted the custom-http-error-bug-fix branch February 14, 2019 15:14
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/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.

4 participants