Fix a bug in Ingress update handler #3633
Merged
+249
−86
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
k8s-ci-robot
added
cncf-cla: yes
|
/assign @ElvinEfendi You'll probably want to include that in 0.22.0 release. |
wayt
force-pushed
the
ingress-update-handler
branch
from
fc3842a to
1eb9079
Compare
aledbf
reviewed
Jan 7, 2019
test/e2e/settings/ingress_class.go
Outdated
| f.EnsureIngress(ing) | ||
|
|
||
| f.WaitForNginxServer(invalidHost, func(cfg string) bool { | ||
| return strings.Contains(cfg, "server_name foo") |
There was a problem hiding this comment.
If the ingress is not valid, this configuration will never be generated.
There was a problem hiding this comment.
this should be:
f.WaitForNginxConfiguration(func(cfg string) bool {
return !strings.Contains(cfg, "server_name foo")
})
There was a problem hiding this comment.
that's true 😕 but I managed to have it pass the e2e test locally. I'll check that out. Thanks!
wayt
force-pushed
the
ingress-update-handler
branch
from
1eb9079 to
3fa8395
Compare
|
/approve |
k8s-ci-robot
added
the
approved
|
/lgtm |
k8s-ci-robot
added
the
lgtm
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: aledbf, ElvinEfendi, wayt 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 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What this PR does / why we need it:
As discussed #3586 (comment)
Changes to annotation
kubernetes.io/ingress.classand.spec.rules/.spec.backendwere not correctly handled.If the new value wasn't valid, the old Ingress was kept and updated instead of being deleted.
This was introduced in #3474 (@aledbf can you confirm?).
New tests have been added to prevent future regression.
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: