Fix e2e endpoints tests on Mesos #12410
Merged
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
Before this patch endpoints were validated by container IP and port. Depending on the endpoint controller logic neither of the two must match for a valid endpoint (e.g. in a Mesos setup). This patch checks that the endpoint targetRef points to the right pod by UID, instead of comparing IPs. A later patch will make sure the compared port is the actual container port, not the host port. /xref d2iq-archive/kubernetes-mesos#365
The EndpointPort struct only stores one port: the port which is used to connect to the container from outside. In the case of the Mesos endpoint controller this is the host port. The container port is not part of the endpoint structure at all. A number of e2e tests need the container port information to validate correct endpoint creation. Therefore this patch annotates the Endpoint struct with a number of annotations mapping "<HostIP>:<HostPort>" to "<ContainerPort>". In a follow-up commit these annotations are used to validate endpoints in a Mesos setup.
|
Can one of the admins verify that this patch is reasonable to test? (reply "ok to test", or if you trust the user, reply "add to whitelist") If this message is too spammy, please complain to ixdy. |
|
/cc @jdef for internal review |
|
|
||
| // use endpoint annotations to recover the container port in a Mesos setup | ||
| // compare contrib/mesos/pkg/service/endpoints_controller.syncService | ||
| // TODO(sttts): add ContainerPort to EndpointPort struct, defaulting to (host) Port |
There was a problem hiding this comment.
i'm not sure about this TODO, doesn't really seem like the right way to solve this. perhaps remove the TODO here and add an issue for tracking this idea in the k8s-mesos repo?
|
minor doc nit, otherwise lgtm. /cc @thockin |
sttts
changed the title
satnam6502
added
the
lgtm
|
LGTM |
a-robinson
added a commit
that referenced
this pull request
Aug 10, 2015
…ort-names Fix e2e endpoints tests on Mesos
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.
Before this PR endpoints were validated by container IP and port in a number of e2e tests.
Depending on the endpoint controller logic neither of the two must match for a valid endpoint (e.g. in a Mesos setup).
This PR fixes the service.go e2e tests to compare the pod ID of an endpoint instead of the IP.
Moreover, it makes sure the compared port is the actual container port, not the host port.
The implemented solution for recovering the container ports from an endpoint in the case of Mesos clusters are annotations on the endpoints. These are applied by the Mesos endpoint conroller to be able to lookup the container port which is not part of the EndpointPort struct.