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

Fix Kubernetes duplication in version command #953

Merged
merged 1 commit into from
Mar 23, 2018
Merged

Fix Kubernetes duplication in version command #953

merged 1 commit into from
Mar 23, 2018

Conversation

silvin-lubecki
Copy link
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
Copy link
Contributor

@dnephin dnephin 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 approved these changes Mar 20, 2018
View reviewed changes
Copy link
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
Fix Kubernetes duplication in version command when the server already…
54bb5ff 
… exposes one Kubernetes component

Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>
@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

@vdemeester vdemeester vdemeester approved these changes

@dnephin dnephin dnephin approved these changes

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