Skip to content

Orchestrator column - #973

Merged
thaJeztah merged 1 commit into
docker:masterfrom
silvin-lubecki:orchestrator-column
Apr 30, 2018
Merged

Orchestrator column#973
thaJeztah merged 1 commit into
docker:masterfrom
silvin-lubecki:orchestrator-column

Conversation

@silvin-lubecki

Copy link
Copy Markdown
Contributor

- What I did
To perform administration tasks more easily, I added an ORCHESTRATOR column in the docker stack ls command.

⚠️ Depends on #903⚠️

- How I did it
I added a column in the Stack formatter, and hardcoded the orchestrator in each list command implementation.

- How to verify it

$ DOCKER_ORCHESTRATOR=kubernetes docker stack ls
NAME SERVICES ORCHESTRATOR
mystack 3 Kubernetes
$ DOCKER_ORCHESTRATOR=swarm docker stack ls
NAME SERVICES ORCHESTRATOR
mystack 4 Swarm

- Description for the changelog
Added ORCHESTRATOR column to docker stack ls command

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

@vdemeester

Copy link
Copy Markdown
Collaborator

Seems like you have test failure 😓

@silvin-lubecki

Copy link
Copy Markdown
ContributorAuthor

Don't know what you are talking about 😅

@vdemeestervdemeester 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 on commit 8108934

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

left one comment for documentation, but otherwise looks good.

I added [WIP] to the PR title, as this depends on the other PR's being merged first

"Services": stackServicesHeader,
"Name": nameHeader,
"Services": stackServicesHeader,
"Orchestrator": stackOrchestrastorHeader,

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.

Can you:

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.

This should be fixed, can you PTAL? Thanks!

@mat007
mat007force-pushed the orchestrator-column branch from 762d84c to a4e4924CompareApril 30, 2018 08:03

@thaJeztahthaJeztah 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 after the other PR's are merged and this is rebased

Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>
@mat007
mat007force-pushed the orchestrator-column branch from a4e4924 to 13d0c9cCompareApril 30, 2018 10:04
@mat007

Copy link
Copy Markdown
Member

Rebased (and squashed the doc update) !

@thaJeztahthaJeztah changed the title [WIP] Orchestrator columnOrchestrator columnApr 30, 2018

@thaJeztahthaJeztah 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 👍

@thaJeztah
thaJeztah merged commit 3a55cd7 into docker:masterApr 30, 2018
@GordonTheTurtleGordonTheTurtle added this to the 18.05.0 milestone Apr 30, 2018
@thaJeztahthaJeztah modified the milestones: 18.05.0, 18.06.0Apr 30, 2018
@silvin-lubecki
silvin-lubecki deleted the orchestrator-column branch May 18, 2018 12:16
Sign up for freeto 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.

5 participants

@silvin-lubecki@vdemeester@mat007@thaJeztah@GordonTheTurtle