Add namespace column for docker stack ls command while targeting Kubernetes orchestrator
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>
This commit is contained in:
committed by
Mathieu Champlon
parent
31dccfffb5
commit
65526a201f
@ -5,10 +5,14 @@ import (
|
||||
)
|
||||
|
||||
const (
|
||||
defaultStackTableFormat = "table {{.Name}}\t{{.Services}}\t{{.Orchestrator}}"
|
||||
// KubernetesStackTableFormat is the default Kubernetes stack format
|
||||
KubernetesStackTableFormat = "table {{.Name}}\t{{.Services}}\t{{.Orchestrator}}\t{{.Namespace}}"
|
||||
// SwarmStackTableFormat is the default Swarm stack format
|
||||
SwarmStackTableFormat = "table {{.Name}}\t{{.Services}}\t{{.Orchestrator}}"
|
||||
|
||||
stackServicesHeader = "SERVICES"
|
||||
stackOrchestrastorHeader = "ORCHESTRATOR"
|
||||
stackNamespaceHeader = "NAMESPACE"
|
||||
)
|
||||
|
||||
// Stack contains deployed stack information.
|
||||
@ -17,17 +21,10 @@ type Stack struct {
|
||||
Name string
|
||||
// Services is the number of the services
|
||||
Services int
|
||||
// Orchestratort is the platform on which the stack is deployed
|
||||
// Orchestrator is the platform where the stack is deployed
|
||||
Orchestrator string
|
||||
}
|
||||
|
||||
// NewStackFormat returns a format for use with a stack Context
|
||||
func NewStackFormat(source string) Format {
|
||||
switch source {
|
||||
case TableFormatKey:
|
||||
return defaultStackTableFormat
|
||||
}
|
||||
return Format(source)
|
||||
// Namespace is the Kubernetes namespace assigned to the stack
|
||||
Namespace string
|
||||
}
|
||||
|
||||
// StackWrite writes formatted stacks using the Context
|
||||
@ -54,6 +51,7 @@ func newStackContext() *stackContext {
|
||||
"Name": nameHeader,
|
||||
"Services": stackServicesHeader,
|
||||
"Orchestrator": stackOrchestrastorHeader,
|
||||
"Namespace": stackNamespaceHeader,
|
||||
}
|
||||
return &stackCtx
|
||||
}
|
||||
@ -73,3 +71,7 @@ func (s *stackContext) Services() string {
|
||||
func (s *stackContext) Orchestrator() string {
|
||||
return s.s.Orchestrator
|
||||
}
|
||||
|
||||
func (s *stackContext) Namespace() string {
|
||||
return s.s.Namespace
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user