Mesos tagging and generic container tagger #3375
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
xvello
force-pushed
the
xvello/mesosutil
branch
4 times, most recently
from
88e6a5f to
91d57f3
Compare
xvello
changed the title
xvello
changed the title
xvello
force-pushed
the
xvello/mesosutil
branch
5 times, most recently
from
b354caa to
42ca27a
Compare
xvello
changed the title
hkaj
requested changes
Jun 8, 2017
utils/orchestrator/baseutil.py
Outdated
| if (self.needs_inspect or self.needs_env) and co is None: | ||
| co = self.docker_util.inspect_container(cid) | ||
| if self.needs_env and 'Env' not in co.get('Config', {}): | ||
| co = self.docker_util.inspect_container(cid) |
There was a problem hiding this comment.
this feels a bit clunky. Maybe if (self.needs_inspect or self.needs_env) and (co is None or 'Env' not in co.get('Config, {})) and remove the second if?
There was a problem hiding this comment.
The idea was to be able to accept the partial inspects (without the config section) that the docker_daemon currently gets (needs_inspect = true / needs_env = false), but it does feel clunky.
I could go with more explicit need_inspect_labels (they are found in the partial inspect) and need_inspect_config (needs a full inspect) instead of need_inspect
| need_inspect_config | need_inspect_labels | |
|---|---|---|
| ECS | N | N |
| Mesos | Y | N |
| Nomad | Y | N |
| Rancher | N | Y |
hkaj
approved these changes
Jun 12, 2017
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 does this PR do?
Introduces a generic container tagger mechanism to support all orchestrators through a common interface instead of expanding
SDDockerBackend.get_tagsandDockerDaemon._get_tagsonce again.This introduces three classes:
Orchestrator.BaseUtil: provides the common interface and the caching and container inspect logicOrchestrator.MesosUtil: inherits BaseUtil and just implements_get_cacheable_tagsandis_detectedOrchestrator.Tagger: triggers orchestrator detection and proxies calls to relevant BaseUtil classesECSUtil and NomadUtil will be moved to BaseUtil if this PR is approved.
Test
unit tests in the test_orchestrator.py file