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.

Sign up for GitHub

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

Jump to bottom

docker_swarm: make labels work with older docker daemon versions #52895

Merged
merged 3 commits into from
Feb 25, 2019
Merged

docker_swarm: make labels work with older docker daemon versions #52895

merged 3 commits into from
Feb 25, 2019

Conversation

felixfontein
Copy link
Contributor

@felixfontein felixfontein commented Feb 24, 2019 •
edited

SUMMARY

Swarm node labels don't work with older docker daemon versions.

Fixes #51175. Supersedes #51264.

ISSUE TYPE
  • Bugfix Pull Request
COMPONENT NAME

docker_swarm

@felixfontein felixfontein mentioned this pull request Feb 24, 2019
Closed
@ansibot
Copy link
Contributor

ansibot commented Feb 24, 2019

cc @DBendit @WojciechowskiPiotr @akshay196 @danihodovic @dariko @jwitko @kassiansun @tbouvet
click here for bot help

@ansibot ansibot added affects_2.8 This issue/PR affects Ansible v2.8 bug This issue/PR relates to a bug. cloud community_review In order to be merged, this PR must follow the community review workflow. docker module This issue/PR relates to a module. needs_triage Needs a first human triage before being processed. owner_pr This PR is made by the module's maintainer. support:community This issue/PR relates to code supported by the Ansible community. needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR. and removed community_review In order to be merged, this PR must follow the community review workflow. labels Feb 24, 2019
@ansibot ansibot added test This PR relates to tests. and removed owner_pr This PR is made by the module's maintainer. labels Feb 24, 2019
@felixfontein felixfontein mentioned this pull request Feb 24, 2019
Merged
@ansibot ansibot added community_review In order to be merged, this PR must follow the community review workflow. and removed needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR. labels Feb 24, 2019
@WojciechowskiPiotr
Copy link
Contributor

Maybe it should be good to move inspect_swarm to DockerAnsibleSwarmClient? And difference tracker as well?

@ansibot ansibot removed the needs_triage Needs a first human triage before being processed. label Feb 24, 2019
@felixfontein
Copy link
Contributor Author

inspect_swarm makes sense, at least the part which calls client.inspect_swarm() and decodes the output. Moving the difference tracker doesn't make sense, because that's not needed for every module which uses DockerAnsibleSwarmClient (facts modules don't need it, for example), and modules might want to use it differently than it is used in docker_swarm.

Anyway, in this PR DockerAnsibleSwarmClient isn't available since this PR needs to be backported to 2.7.

@WojciechowskiPiotr
Copy link
Contributor

inspect_swarm makes sense, at least the part which calls client.inspect_swarm() and decodes the output.

Ok, we will move it later when this PR gets merged

@WojciechowskiPiotr
Copy link
Contributor

shipit

@ansibot ansibot added shipit This PR is ready to be merged by Core and removed community_review In order to be merged, this PR must follow the community review workflow. labels Feb 25, 2019
@gundalow gundalow merged commit a1ec307 into ansible:devel Feb 25, 2019
@gundalow
Copy link
Contributor

Merged, thanks all!

@felixfontein felixfontein deleted the docker_swarm-labels branch February 25, 2019 09:38
@felixfontein
Copy link
Contributor Author

@WojciechowskiPiotr thanks for reviewing!
@gundalow thanks for merging!

This was referenced Feb 25, 2019
Merged
Merged
@felixfontein felixfontein mentioned this pull request Feb 27, 2019
Merged
felixfontein added a commit to felixfontein/ansible that referenced this pull request Feb 28, 2019
@felixfontein
docker_swarm: make labels work with older docker daemon versions (ans…
e78a2af 
…ible#52895)

* Make labels work with older docker daemon versions.

* Fix idempotence detection.

* Add changelog.

(cherry picked from commit a1ec307)
abadger pushed a commit that referenced this pull request Mar 1, 2019
@felixfontein @abadger
docker_swarm: make labels work with older docker daemon versions (#52895
aed59e5 
)

* Make labels work with older docker daemon versions.

* Fix idempotence detection.

* Add changelog.

(cherry picked from commit a1ec307)
@ansible ansible locked and limited conversation to collaborators Jul 25, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
affects_2.8 This issue/PR affects Ansible v2.8 bug This issue/PR relates to a bug. cloud docker module This issue/PR relates to a module. shipit This PR is ready to be merged by Core support:community This issue/PR relates to code supported by the Ansible community. test This PR relates to tests.
Projects
None yet
Milestone
No milestone
4 participants
@felixfontein @ansibot @WojciechowskiPiotr @gundalow