From 79fd386dda05ad9a162791dd20d542e1b5d25e44 Mon Sep 17 00:00:00 2001 From: Felipe Galindo Sanchez Date: Tue, 3 Oct 2023 15:27:26 -0700 Subject: [PATCH 1/3] fix: honor defaults from dialog into request --- internal/view/drain_dialog.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/internal/view/drain_dialog.go b/internal/view/drain_dialog.go index 76e0f1bf71..3d7253e9d8 100644 --- a/internal/view/drain_dialog.go +++ b/internal/view/drain_dialog.go @@ -26,7 +26,13 @@ func ShowDrain(view ResourceViewer, path string, defaults dao.DrainOptions, okFn SetLabelColor(styles.K9s.Info.FgColor.Color()). SetFieldTextColor(styles.K9s.Info.SectionColor.Color()) - var opts dao.DrainOptions + opts := dao.DrainOptions{ + GracePeriodSeconds: defaults.GracePeriodSeconds, + Timeout: defaults.Timeout, + IgnoreAllDaemonSets: defaults.IgnoreAllDaemonSets, + DeleteEmptyDirData: defaults.DeleteEmptyDirData, + Force: defaults.Force, + } f.AddInputField("GracePeriod:", strconv.Itoa(defaults.GracePeriodSeconds), 0, nil, func(v string) { a, err := asIntOpt(v) if err != nil { From a6492a3085c4b8b5098d00591ddbdaef83765baa Mon Sep 17 00:00:00 2001 From: Felipe Galindo Sanchez Date: Mon, 9 Oct 2023 08:24:17 -0700 Subject: [PATCH 2/3] reuse options/defaults from arg --- internal/view/drain_dialog.go | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/internal/view/drain_dialog.go b/internal/view/drain_dialog.go index 3d7253e9d8..ac6c947c06 100644 --- a/internal/view/drain_dialog.go +++ b/internal/view/drain_dialog.go @@ -15,7 +15,7 @@ const drainKey = "drain" type DrainFunc func(v ResourceViewer, path string, opts dao.DrainOptions) // ShowDrain pops a node drain dialog. -func ShowDrain(view ResourceViewer, path string, defaults dao.DrainOptions, okFn DrainFunc) { +func ShowDrain(view ResourceViewer, path string, opts dao.DrainOptions, okFn DrainFunc) { styles := view.App().Styles f := tview.NewForm() @@ -26,13 +26,6 @@ func ShowDrain(view ResourceViewer, path string, defaults dao.DrainOptions, okFn SetLabelColor(styles.K9s.Info.FgColor.Color()). SetFieldTextColor(styles.K9s.Info.SectionColor.Color()) - opts := dao.DrainOptions{ - GracePeriodSeconds: defaults.GracePeriodSeconds, - Timeout: defaults.Timeout, - IgnoreAllDaemonSets: defaults.IgnoreAllDaemonSets, - DeleteEmptyDirData: defaults.DeleteEmptyDirData, - Force: defaults.Force, - } f.AddInputField("GracePeriod:", strconv.Itoa(defaults.GracePeriodSeconds), 0, nil, func(v string) { a, err := asIntOpt(v) if err != nil { From 8145c41325b214985fd8bbb69b47a3364f852e61 Mon Sep 17 00:00:00 2001 From: Felipe Galindo Sanchez Date: Mon, 9 Oct 2023 08:43:37 -0700 Subject: [PATCH 3/3] fix additional references for defaults --- internal/view/drain_dialog.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/internal/view/drain_dialog.go b/internal/view/drain_dialog.go index ac6c947c06..ed56a99e2d 100644 --- a/internal/view/drain_dialog.go +++ b/internal/view/drain_dialog.go @@ -26,7 +26,7 @@ func ShowDrain(view ResourceViewer, path string, opts dao.DrainOptions, okFn Dra SetLabelColor(styles.K9s.Info.FgColor.Color()). SetFieldTextColor(styles.K9s.Info.SectionColor.Color()) - f.AddInputField("GracePeriod:", strconv.Itoa(defaults.GracePeriodSeconds), 0, nil, func(v string) { + f.AddInputField("GracePeriod:", strconv.Itoa(opts.GracePeriodSeconds), 0, nil, func(v string) { a, err := asIntOpt(v) if err != nil { view.App().Flash().Err(err) @@ -35,7 +35,7 @@ func ShowDrain(view ResourceViewer, path string, opts dao.DrainOptions, okFn Dra view.App().Flash().Clear() opts.GracePeriodSeconds = a }) - f.AddInputField("Timeout:", defaults.Timeout.String(), 0, nil, func(v string) { + f.AddInputField("Timeout:", opts.Timeout.String(), 0, nil, func(v string) { a, err := asDurOpt(v) if err != nil { view.App().Flash().Err(err) @@ -44,13 +44,13 @@ func ShowDrain(view ResourceViewer, path string, opts dao.DrainOptions, okFn Dra view.App().Flash().Clear() opts.Timeout = a }) - f.AddCheckbox("Ignore DaemonSets:", defaults.IgnoreAllDaemonSets, func(_ string, v bool) { + f.AddCheckbox("Ignore DaemonSets:", opts.IgnoreAllDaemonSets, func(_ string, v bool) { opts.IgnoreAllDaemonSets = v }) - f.AddCheckbox("Delete Local Data:", defaults.DeleteEmptyDirData, func(_ string, v bool) { + f.AddCheckbox("Delete Local Data:", opts.DeleteEmptyDirData, func(_ string, v bool) { opts.DeleteEmptyDirData = v }) - f.AddCheckbox("Force:", defaults.Force, func(_ string, v bool) { + f.AddCheckbox("Force:", opts.Force, func(_ string, v bool) { opts.Force = v })