kubernetes
/
kubectl
mirror of https://github.com/kubernetes/kubectl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

dedup the printHistory logic in DaemonSetHistoryViewer,StatefulSetHistoryViewer 

Signed-off-by: Dinesh <dineshudt17@gmail.com>

Kubernetes-commit: fe1e72e792c0f9f42e0ba2e3291ed0dde2cf262a
This commit is contained in:
Dinesh 2020-03-29 21:12:49 +05:30 committed by Kubernetes Publisher
parent e112514f70
commit 88b59619ba
2 changed files with 18 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
pkg/polymorphichelpers/history.go
View File

@ -183,6 +183,16 @@ func (h *DaemonSetHistoryViewer) ViewHistory(namespace, name string, revision in
if err != nil { if err != nil {
return "", err return "", err
} }
return printHistory(history, revision, func(history *appsv1.ControllerRevision) (*corev1.PodTemplateSpec, error) {
dsOfHistory, err := applyDaemonSetHistory(ds, history)
if err != nil {
return nil, err
}
return &dsOfHistory.Spec.Template, err
})
}
func printHistory(history []*appsv1.ControllerRevision, revision int64, getPodTemplate func(history *appsv1.ControllerRevision) (*corev1.PodTemplateSpec, error)) (string, error) {
historyInfo := make(map[int64]*appsv1.ControllerRevision) historyInfo := make(map[int64]*appsv1.ControllerRevision)
for _, history := range history { for _, history := range history {
// TODO: for now we assume revisions don't overlap, we may need to handle it // TODO: for now we assume revisions don't overlap, we may need to handle it
@ -198,11 +208,11 @@ func (h *DaemonSetHistoryViewer) ViewHistory(namespace, name string, revision in
if !ok { if !ok {
return "", fmt.Errorf("unable to find the specified revision") return "", fmt.Errorf("unable to find the specified revision")
} }
dsOfHistory, err := applyDaemonSetHistory(ds, history) podTemplate, err := getPodTemplate(history)
if err != nil { if err != nil {
return "", fmt.Errorf("unable to parse history %s", history.Name) return "", fmt.Errorf("unable to parse history %s", history.Name)
} }
return printTemplate(&dsOfHistory.Spec.Template) return printTemplate(podTemplate)
} }
// Print an overview of all Revisions // Print an overview of all Revisions
@ -238,39 +248,12 @@ func (h *StatefulSetHistoryViewer) ViewHistory(namespace, name string, revision
if err != nil { if err != nil {
return "", err return "", err
} }
return printHistory(history, revision, func(history *appsv1.ControllerRevision) (*corev1.PodTemplateSpec, error) {
if len(history) <= 0 { stsOfHistory, err := applyStatefulSetHistory(sts, history)
return "No rollout history found.", nil
}
historyInfo := make(map[int64]*appsv1.ControllerRevision)
for _, h := range history {
historyInfo[h.Revision] = h
}
if revision != 0 {
value, ok := historyInfo[revision]
if !ok {
return "", fmt.Errorf("unable to find the specified revision")
}
sts, err := applyStatefulSetHistory(sts, value)
if err != nil { if err != nil {
return "", fmt.Errorf("error unmarshelling sts: %w", err) return nil, err
} }
return printTemplate(&sts.Spec.Template) return &stsOfHistory.Spec.Template, err
}
revisions := make([]int64, 0, len(historyInfo))
for revision := range historyInfo {
revisions = append(revisions, revision)
}
sliceutil.SortInts64(revisions)
return tabbedString(func(out io.Writer) error {
fmt.Fprintf(out, "REVISION\n")
for _, r := range revisions {
fmt.Fprintf(out, "%d\n", r)
}
return nil
}) })
} }

4
pkg/polymorphichelpers/history_test.go
View File

@ -105,8 +105,8 @@ func TestViewHistory(t *testing.T) {
t.Fatalf("error getting ViewHistory for a StatefulSets moons: %v", err) t.Fatalf("error getting ViewHistory for a StatefulSets moons: %v", err)
} }
expected := `REVISION expected := `REVISION CHANGE-CAUSE
1 1 <none>
` `
if result != expected { if result != expected {