Skip to content

Add API-version anotation for --data-path-addr#1240

Merged
vdemeester merged 1 commit intodocker:masterfrom
thaJeztah:datapath_addr_api_annotation
Jul 30, 2018
Merged

Add API-version anotation for --data-path-addr#1240
vdemeester merged 1 commit intodocker:masterfrom
thaJeztah:datapath_addr_api_annotation

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

@thaJeztah thaJeztah commented Jul 30, 2018 •
edited
Loading

This flag was added in Docker 17.06, API version 1.31 through moby/moby@8dc8cd4 8(moby/moby#32717), but didn't add API-version annotations.

This patch adds the missing annotations to hide this flag if the CLI is connected to an older version of the daemon that doesn't support that API.

Before this patch:

DOCKER_API_VERSION=1.30 docker swarm init --help | grep data-path-addr
      --data-path-addr string           Address or interface to use for data path traffic (format: <ip|interface>)

DOCKER_API_VERSION=1.31 docker swarm init --help | grep data-path-addr
      --data-path-addr string           Address or interface to use for data path traffic (format: <ip|interface>)

With this patch applied:

DOCKER_API_VERSION=1.30 docker swarm init --help | grep data-path-addr
# (no result)

DOCKER_API_VERSION=1.31 docker swarm init --help | grep data-path-addr
      --data-path-addr string           Address or interface to use for data path traffic (format: <ip|interface>)

- How to verify it

See above

- Description for the changelog

+ Hide `--data-path-addr` flags when connected to a daemon that doesn't support this option [docker/cli#1240](https://github.com/docker/cli/pull/1240)

@thaJeztah
Add API-version anotation for --data-path-addr
91b1ad9 
This flag was added in Docker 17.06, API version 1.31 through
moby@8dc8cd4719f165c01c98e7d3ce1d6cea6a8f60b8, but didn't add
API-version annotations.

This patch adds the missing annotations to hide this flag if
the CLI is connected to an older version of the daemon that
doesn't support that API.

Before this patch:

    DOCKER_API_VERSION=1.30 docker swarm init --help | grep data-path-addr
          --data-path-addr string           Address or interface to use for data path traffic (format: <ip|interface>)

    DOCKER_API_VERSION=1.31 docker swarm init --help | grep data-path-addr
          --data-path-addr string           Address or interface to use for data path traffic (format: <ip|interface>)

With this patch applied:

    DOCKER_API_VERSION=1.30 docker swarm init --help | grep data-path-addr
    # (no result)

    DOCKER_API_VERSION=1.31 docker swarm init --help | grep data-path-addr
          --data-path-addr string           Address or interface to use for data path traffic (format: <ip|interface>)

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
Copy link
Copy Markdown
Member Author

thaJeztah commented Jul 30, 2018

ping @fcrisciani @selansen

@codecov-io
Copy link
Copy Markdown

codecov-io commented Jul 30, 2018 •
edited
Loading

Codecov Report

Merging #1240 into master will increase coverage by <.01%.
The diff coverage is 100%.

@@            Coverage Diff             @@
##           master    #1240      +/-   ##
==========================================
+ Coverage   54.23%   54.23%   +<.01%     
==========================================
  Files         268      268              
  Lines       17805    17807       +2     
==========================================
+ Hits         9656     9658       +2     
  Misses       7542     7542              
  Partials      607      607

vdemeester
vdemeester approved these changes Jul 30, 2018
View reviewed changes
Copy link
Copy Markdown
Collaborator

@vdemeester vdemeester left a comment

Choose a reason for hiding this comment

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

LGTM 🐯

silvin-lubecki
silvin-lubecki approved these changes Jul 30, 2018
View reviewed changes
Copy link
Copy Markdown
Contributor

@silvin-lubecki silvin-lubecki left a comment

Choose a reason for hiding this comment

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

LGTM

fcrisciani
fcrisciani approved these changes Jul 30, 2018
View reviewed changes
Copy link
Copy Markdown

@fcrisciani fcrisciani left a comment

Choose a reason for hiding this comment

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

LGTM

@vdemeester vdemeester merged commit 19653e7 into docker:master Jul 30, 2018
@GordonTheTurtle GordonTheTurtle added this to the 18.09.0 milestone Jul 30, 2018
@thaJeztah thaJeztah deleted the datapath_addr_api_annotation branch July 30, 2018 15:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@vdemeester vdemeester vdemeester approved these changes

@silvin-lubecki silvin-lubecki silvin-lubecki approved these changes

+1 more reviewer

@fcrisciani fcrisciani fcrisciani approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

impact/changelog status/2-code-review

Projects

None yet

Milestone

18.09.0

Development

Successfully merging this pull request may close these issues.

6 participants

@thaJeztah @codecov-io @vdemeester @fcrisciani @silvin-lubecki @GordonTheTurtle