Skip to content

Data Path Port configuration support#1509

Merged
silvin-lubecki merged 2 commits into
docker:masterfrom
selansen:master
Nov 28, 2018
Merged

Data Path Port configuration support#1509
silvin-lubecki merged 2 commits into
docker:masterfrom
selansen:master

Conversation

@selansen

Copy link
Copy Markdown
Contributor

This PR chnages allow user to configure data path
port number. By default we use 4789 port number. But this commit
will allow user to configure port number during swarm init.
Data path port can't be modified after swarm init.

Signed-off-by: selansen elango.siva@docker.com

- What I did

- How I did it

- How to verify it

- Description for the changelog

- A picture of a cute animal (not mandatory but encouraged)

@codecov-io

codecov-io commented Nov 24, 2018

Copy link
Copy Markdown

Codecov Report

Merging #1509 into master will decrease coverage by 0.07%.
The diff coverage is 60%.

@@            Coverage Diff             @@
##           master    #1509      +/-   ##
==========================================
- Coverage   55.22%   55.15%   -0.08%     
==========================================
  Files         289      289              
  Lines       19384    19376       -8     
==========================================
- Hits        10705    10686      -19     
- Misses       7983     7997      +14     
+ Partials      696      693       -3

@selansen

Copy link
Copy Markdown
Contributor Author

@albers @thaJeztah @vdemeester PTAL

Comment thread cli/command/swarm/opts.go Outdated
Comment thread cli/command/swarm/init.go Outdated
Comment thread contrib/completion/bash/docker
Comment thread contrib/completion/bash/docker Outdated
Comment thread contrib/completion/zsh/_docker Outdated
Comment thread cli/command/system/testdata/docker-info-with-swarm.golden Outdated
Comment thread docs/reference/commandline/swarm_init.md Outdated
Comment thread docs/reference/commandline/swarm_init.md Outdated
Comment thread cli/command/swarm/init.go Outdated
Comment thread vendor.conf
@thaJeztah

Copy link
Copy Markdown
Member

Left some comments; be careful, because GitHub is hiding some of those;

screen shot 2018-11-26 at 12 32 50

This commit brings Swarmkit and docker chnages

Signed-off-by: selansen <elango.siva@docker.com>
@selansen selansen force-pushed the master branch 2 times, most recently from 2eee1a1 to a01545f Compare November 26, 2018 21:14
@selansen

Copy link
Copy Markdown
Contributor Author

Left some comments; be careful, because GitHub is hiding some of those;

I checked all your review comments multiple times and not sure if I still not seeing any of your comment. Pls let me know if I miss anything.

PATL @thaJeztah @albers

@selansen

Copy link
Copy Markdown
Contributor Author

@thaJeztah Do I still need to make any change? Pls let me know

@albers albers left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

bash completion LGTM, thanks.

Comment thread docs/reference/commandline/swarm_init.md Outdated
Comment thread cli/command/swarm/init.go Outdated
Comment thread contrib/completion/zsh/_docker Outdated
Comment thread docs/reference/commandline/swarm_init.md Outdated

@thaJeztah thaJeztah left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks!

@selansen

Copy link
Copy Markdown
Contributor Author

@albers @vdemeester PTAL

@silvin-lubecki silvin-lubecki left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Only one comment, LGTM if fixed, thank you @selansen !

Comment thread docs/reference/commandline/swarm_init.md Outdated
This PR chnages allow user to configure data path
port number. By default we use 4789 port number. But this commit
will allow user to configure port number during swarm init.
Data path port can't be modified after swarm init.

Signed-off-by: selansen <elango.siva@docker.com>
@selansen

selansen commented Nov 28, 2018

Copy link
Copy Markdown
Contributor Author

@thaJeztah PTAL

@silvin-lubecki silvin-lubecki merged commit 69bd272 into docker:master Nov 28, 2018
@GordonTheTurtle GordonTheTurtle added this to the 19.03.0 milestone Nov 28, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants