Resolves issue with proxy-redirect nginx configuration #2423
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
|
Still need to test this btw. |
|
|
@diazjf please add e2e tests with the same checks you showed in the comments |
k8s-ci-robot
added
size/L
|
@aledbf in order to run E2E Tests is the following correct:
I am getting the following errors: Also another question, should we add RBAC to https://github.com/kubernetes/minikube/pull/2788/files |
|
@aledbf ^ |
|
@diazjf please rebase and run
Yes, before the end of the day I will open a PR to fix this. |
diazjf
force-pushed
the
fix-2074
branch
3 times, most recently
from
d6d622e to
397bee7
Compare
Resolves an issue where the proxy-redirect annotations were not generating the correct configuration possibly because of user error. This is done by only setting the proxy_redirect if both proxy-redirect-from and proxy-redirect-to have valid values. Also adds the e2e tests. Fixes kubernetes#2074
diazjf
commented
May 17, 2018
| @@ -262,7 +262,7 @@ func (f *Framework) matchNginxConditions(name string, matcher func(cfg string) b | |||
| glog.Infof("nginx.conf:\n%v", o) | |||
| } | |||
|
|
|||
| if matcher(o) { | |||
| if matcher(strings.Join(strings.Fields(o), " ")) { | |||
There was a problem hiding this comment.
Add this there are sections with some variable spaces within the template
strings.Fields(o) = splits everything up by 1 or more spaces, then we join each item, with spaces in-between
Codecov Report
@@ Coverage Diff @@
## master #2423 +/- ##
==========================================
+ Coverage 40.74% 40.76% +0.01%
==========================================
Files 73 73
Lines 5021 5022 +1
==========================================
+ Hits 2046 2047 +1
Misses 2701 2701
Partials 274 274
Continue to review full report at Codecov.
|
|
/approve |
k8s-ci-robot
added
the
approved
|
@diazjf thanks! |
|
/lgtm |
k8s-ci-robot
added
the
lgtm
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: aledbf, diazjf 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.
Resolves an issue where the proxy-redirect annotations were not generating the correct configuration possibly because of user error. This is resolved by only setting the proxy_redirect if both proxy-redirect-from and proxy-redirect-to have valid values.
Fixes #2074