Skip to content

Commit

Permalink
Merge pull request #111093 from brianpursley/k-110097
Browse files Browse the repository at this point in the history
Fix rollout history bug
  • Loading branch information
k8s-ci-robot committed Aug 24, 2022
2 parents 4bf457e + 693e129 commit 8674ce5
Show file tree
Hide file tree
Showing 5 changed files with 815 additions and 14 deletions.
39 changes: 39 additions & 0 deletions staging/src/k8s.io/kubectl/pkg/cmd/rollout/rollout_history.go
Expand Up @@ -18,6 +18,7 @@ package rollout

import (
"fmt"
"sort"

"github.com/spf13/cobra"

Expand Down Expand Up @@ -153,6 +154,44 @@ func (o *RolloutHistoryOptions) Run() error {
return err
}

if o.PrintFlags.OutputFlagSpecified() {
printer, err := o.PrintFlags.ToPrinter()
if err != nil {
return err
}

return r.Visit(func(info *resource.Info, err error) error {
if err != nil {
return err
}

mapping := info.ResourceMapping()
historyViewer, err := o.HistoryViewer(o.RESTClientGetter, mapping)
if err != nil {
return err
}
historyInfo, err := historyViewer.GetHistory(info.Namespace, info.Name)
if err != nil {
return err
}

if o.Revision > 0 {
printer.PrintObj(historyInfo[o.Revision], o.Out)
} else {
sortedKeys := make([]int64, 0, len(historyInfo))
for k := range historyInfo {
sortedKeys = append(sortedKeys, k)
}
sort.Slice(sortedKeys, func(i, j int) bool { return sortedKeys[i] < sortedKeys[j] })
for _, k := range sortedKeys {
printer.PrintObj(historyInfo[k], o.Out)
}
}

return nil
})
}

return r.Visit(func(info *resource.Info, err error) error {
if err != nil {
return err
Expand Down

0 comments on commit 8674ce5

Please sign in to comment.