Skip to content

Update deployment logs and surge on recreate #8787

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

Merged
openshift-bot merged 9 commits into from
May 16, 2016
Merged

Update deployment logs and surge on recreate #8787

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f705fe8
Update deployment logs and surge on recreate
smarterclayton May 7, 2016
33bcf05
Add an annotation that skips creating deployer pods
smarterclayton May 7, 2016
55919cd
If desired conditions match, don't go into a wait loop
smarterclayton May 8, 2016
3fdf3e9
UPSTREAM: 25617: Rolling updater should indicate progress
smarterclayton May 8, 2016
f72fae6
Add incremental conditional completion to deployments
smarterclayton May 8, 2016
4adfd6a
Enable custom deployments to have rolling/recreate as well
smarterclayton May 8, 2016
c6aeef3
Updated generated deepcopy/conversion
smarterclayton May 9, 2016
759363d
Recreate deployment should always run the acceptor
smarterclayton May 12, 2016
f92fe67
Print hooks for custom deployments and multiline commands
smarterclayton May 16, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 39 additions & 0 deletions Godeps/_workspace/src/k8s.io/kubernetes/pkg/kubectl/rolling_updater.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions contrib/completions/bash/openshift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15788,6 +15788,7 @@ _openshift_infra_deploy()

flags+=("--deployment=")
flags+=("--namespace=")
flags+=("--until=")
flags+=("--google-json-key=")
flags+=("--log-flush-frequency=")

Expand Down
97 changes: 61 additions & 36 deletions pkg/cmd/cli/describe/deployments.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,53 +172,78 @@ func (d *DeploymentConfigDescriber) Describe(namespace, name string) (string, er
})
}

func printStrategy(strategy deployapi.DeploymentStrategy, w *tabwriter.Writer) {
switch strategy.Type {
case deployapi.DeploymentStrategyTypeRecreate:
if strategy.RecreateParams != nil {
pre := strategy.RecreateParams.Pre
mid := strategy.RecreateParams.Mid
post := strategy.RecreateParams.Post
if pre != nil {
printHook("Pre-deployment", pre, w)
}
if mid != nil {
printHook("Mid-deployment", mid, w)
}
if post != nil {
printHook("Post-deployment", post, w)
}
func multilineStringArray(sep, indent string, args ...string) string {
for i, s := range args {
if strings.HasSuffix(s, "\n") {
s = strings.TrimSuffix(s, "\n")
}
case deployapi.DeploymentStrategyTypeRolling:
if strategy.RollingParams != nil {
pre := strategy.RollingParams.Pre
post := strategy.RollingParams.Post
if pre != nil {
printHook("Pre-deployment", pre, w)
}
if post != nil {
printHook("Post-deployment", post, w)
}
if strings.Contains(s, "\n") {
s = "\n" + indent + strings.Join(strings.Split(s, "\n"), "\n"+indent)
}
args[i] = s
}
strings.TrimRight(args[len(args)-1], "\n ")
return strings.Join(args, " ")
}

func printStrategy(strategy deployapi.DeploymentStrategy, indent string, w *tabwriter.Writer) {
if strategy.CustomParams != nil {
if len(strategy.CustomParams.Image) == 0 {
fmt.Fprintf(w, "%sImage:\t%s\n", indent, "<default>")
} else {
fmt.Fprintf(w, "%sImage:\t%s\n", indent, strategy.CustomParams.Image)
}
case deployapi.DeploymentStrategyTypeCustom:
fmt.Fprintf(w, "\t Image:\t%s\n", strategy.CustomParams.Image)

if len(strategy.CustomParams.Environment) > 0 {
fmt.Fprintf(w, "\t Environment:\t%s\n", formatLabels(convertEnv(strategy.CustomParams.Environment)))
fmt.Fprintf(w, "%sEnvironment:\t%s\n", indent, formatLabels(convertEnv(strategy.CustomParams.Environment)))
}

if len(strategy.CustomParams.Command) > 0 {
fmt.Fprintf(w, "\t Command:\t%v\n", strings.Join(strategy.CustomParams.Command, " "))
fmt.Fprintf(w, "%sCommand:\t%v\n", indent, multilineStringArray(" ", "\t ", strategy.CustomParams.Command...))
}
}

if strategy.RecreateParams != nil {
pre := strategy.RecreateParams.Pre
mid := strategy.RecreateParams.Mid
post := strategy.RecreateParams.Post
if pre != nil {
printHook("Pre-deployment", pre, indent, w)
}
if mid != nil {
printHook("Mid-deployment", mid, indent, w)
}
if post != nil {
printHook("Post-deployment", post, indent, w)
}
}

if strategy.RollingParams != nil {
pre := strategy.RollingParams.Pre
post := strategy.RollingParams.Post
if pre != nil {
printHook("Pre-deployment", pre, indent, w)
}
if post != nil {
printHook("Post-deployment", post, indent, w)
}
}
}

func printHook(prefix string, hook *deployapi.LifecycleHook, w io.Writer) {
func printHook(prefix string, hook *deployapi.LifecycleHook, indent string, w io.Writer) {
if hook.ExecNewPod != nil {
fmt.Fprintf(w, "\t %s hook (pod type, failure policy: %s):\n", prefix, hook.FailurePolicy)
fmt.Fprintf(w, "\t Container:\t%s\n", hook.ExecNewPod.ContainerName)
fmt.Fprintf(w, "\t Command:\t%v\n", strings.Join(hook.ExecNewPod.Command, " "))
fmt.Fprintf(w, "\t Env:\t%s\n", formatLabels(convertEnv(hook.ExecNewPod.Env)))
fmt.Fprintf(w, "%s%s hook (pod type, failure policy: %s):\n", indent, prefix, hook.FailurePolicy)
fmt.Fprintf(w, "%s Container:\t%s\n", indent, hook.ExecNewPod.ContainerName)
fmt.Fprintf(w, "%s Command:\t%v\n", indent, multilineStringArray(" ", "\t ", hook.ExecNewPod.Command...))
if len(hook.ExecNewPod.Env) > 0 {
fmt.Fprintf(w, "%s Env:\t%s\n", indent, formatLabels(convertEnv(hook.ExecNewPod.Env)))
}
}
if len(hook.TagImages) > 0 {
fmt.Fprintf(w, "%s%s hook (tag images, failure policy: %s):\n", indent, prefix, hook.FailurePolicy)
for _, image := range hook.TagImages {
fmt.Fprintf(w, "%s Tag:\tcontainer %s to %s %s %s\n", indent, image.ContainerName, image.To.Kind, image.To.Name, image.To.Namespace)
}
}
}

Expand Down Expand Up @@ -262,7 +287,7 @@ func printDeploymentConfigSpec(spec deployapi.DeploymentConfigSpec, w *tabwriter

// Strategy
formatString(w, "Strategy", spec.Strategy.Type)
printStrategy(spec.Strategy, w)
printStrategy(spec.Strategy, " ", w)

// Pod template
fmt.Fprintf(w, "Template:\n")
Expand Down
Loading