Skip to content

Fix Kubernetes duplication in version command - #953

Merged
vdemeester merged 1 commit into
docker:masterfrom
silvin-lubecki:fix-docker-version-kubernetes
Mar 23, 2018
Merged

Fix Kubernetes duplication in version command#953
vdemeester merged 1 commit into
docker:masterfrom
silvin-lubecki:fix-docker-version-kubernetes

Conversation

@silvin-lubecki

@silvin-lubecki silvin-lubecki commented Mar 20, 2018

Copy link
Copy Markdown
Contributor

- What I did
I fixed the duplication on Kubernetes section when a server already exposes a Kubernetes component.

- How I did it
I simplified the code, removing the Kubernetes section in the versionTemplate, and instead I forge a Kubernetes component if the server does not expose one.

- How to verify it
Using a docker server exposing a kubernetes:
Before:

$ docker version
...
 Kubernetes:
  Version:	1.8+
  goVersion:		go1.8.3
  major:		1
  minor:		8+
  platform:		linux/amd64
 Kubernetes:
  Version:	v1.8.2-docker.146+a366eab099b1e9
  Stack API:	v1beta1

With the fix:

$ docker version
  Kubernetes:
  Version:	1.8+
  StackAPI:	v1beta1
  goVersion:		go1.8.3
  major:		1
  minor:		8+
  platform:		linux/amd64

- Description for the changelog
Fix Kubernetes section duplication in version command

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

dnephin
dnephin approved these changes Mar 20, 2018
View reviewed changes

@dnephin dnephin 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.

LGTM

vdemeester
vdemeester approved these changes Mar 20, 2018
View reviewed changes

@vdemeester vdemeester 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.

LGTM 🐯

@silvin-lubecki
Fix Kubernetes duplication in version command when the server already…
54bb5ff 
… exposes one Kubernetes component

Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>
@silvin-lubecki
silvin-lubecki force-pushed the fix-docker-version-kubernetes branch from c9e4303 to 54bb5ff Compare March 23, 2018 14:53
@vdemeester
vdemeester merged commit c3991d0 into docker:master Mar 23, 2018
@GordonTheTurtle GordonTheTurtle added this to the 18.04.0 milestone Mar 23, 2018
@silvin-lubecki
silvin-lubecki deleted the fix-docker-version-kubernetes branch March 23, 2018 16:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

2 more reviewers
@vdemeester vdemeester vdemeester approved these changes
@dnephin dnephin dnephin approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

area/kubernetes status/2-code-review

Projects

None yet

Milestone

18.04.0

Development

Successfully merging this pull request may close these issues.

5 participants

@silvin-lubecki @vdemeester @dnephin @thaJeztah @GordonTheTurtle