github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-04 23:17:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #23279 from kargakis/export-volume-describer

Browse Source 
Automatic merge from submit-queue

kubectl: enhance podtemplate describer

@kubernetes/kubectl 

@smarterclayton for the dc decsriber
This commit is contained in:
k8s-merge-robot
2016-03-30 12:53:52 -07:00
parent fe58dac522 8477699055
commit f36c44be79
4 changed files with 52 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/kubectl/cmd/rollout/rollout_history.go
View File

@@ -103,7 +103,6 @@ func RunHistory(f *cmdutil.Factory, cmd *cobra.Command, out io.Writer, args []st
continue
}
formattedOutput := ""
if revisionDetail > 0 {
// Print details of a specific revision
template, ok := historyInfo.RevisionToTemplate[revisionDetail]
@@ -111,16 +110,16 @@ func RunHistory(f *cmdutil.Factory, cmd *cobra.Command, out io.Writer, args []st
return fmt.Errorf("unable to find revision %d of %s %q", revisionDetail, mapping.Resource, info.Name)
}
fmt.Fprintf(out, "%s %q revision %d\n", mapping.Resource, info.Name, revisionDetail)
formattedOutput, err = kubectl.DescribePodTemplate(template)
kubectl.DescribePodTemplate(template, out)
} else {
// Print all revisions
formattedOutput, err = kubectl.PrintRolloutHistory(historyInfo, mapping.Resource, info.Name)
formattedOutput, printErr := kubectl.PrintRolloutHistory(historyInfo, mapping.Resource, info.Name)
if printErr != nil {
errs = append(errs, printErr)
continue
}
fmt.Fprintf(out, "%s\n", formattedOutput)
}
if err != nil {
errs = append(errs, err)
continue
}
fmt.Fprintf(out, "%s\n", formattedOutput)
}
return errors.NewAggregate(errs)