jayjay
/
k9s
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: honor defaults from drain dialog in request (#2239) 

* fix: honor defaults from dialog into request

* reuse options/defaults from arg

* fix additional references for defaults
mine
Felipe Galindo Sanchez 2023-10-12 10:27:56 -07:00 committed by GitHub
parent e326b41c31
commit e906fa606f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
internal/view/drain_dialog.go
View File

@ -15,7 +15,7 @@ const drainKey = "drain"
type DrainFunc func(v ResourceViewer, path string, opts dao.DrainOptions) type DrainFunc func(v ResourceViewer, path string, opts dao.DrainOptions)
// ShowDrain pops a node drain dialog. // 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 styles := view.App().Styles
f := tview.NewForm() f := tview.NewForm()
@ -26,8 +26,7 @@ func ShowDrain(view ResourceViewer, path string, defaults dao.DrainOptions, okFn
SetLabelColor(styles.K9s.Info.FgColor.Color()). SetLabelColor(styles.K9s.Info.FgColor.Color()).
SetFieldTextColor(styles.K9s.Info.SectionColor.Color()) SetFieldTextColor(styles.K9s.Info.SectionColor.Color())
var opts dao.DrainOptions f.AddInputField("GracePeriod:", strconv.Itoa(opts.GracePeriodSeconds), 0, nil, func(v string) {
f.AddInputField("GracePeriod:", strconv.Itoa(defaults.GracePeriodSeconds), 0, nil, func(v string) {
a, err := asIntOpt(v) a, err := asIntOpt(v)
if err != nil { if err != nil {
view.App().Flash().Err(err) view.App().Flash().Err(err)
@ -36,7 +35,7 @@ func ShowDrain(view ResourceViewer, path string, defaults dao.DrainOptions, okFn
view.App().Flash().Clear() view.App().Flash().Clear()
opts.GracePeriodSeconds = a 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) a, err := asDurOpt(v)
if err != nil { if err != nil {
view.App().Flash().Err(err) view.App().Flash().Err(err)
@ -45,13 +44,13 @@ func ShowDrain(view ResourceViewer, path string, defaults dao.DrainOptions, okFn
view.App().Flash().Clear() view.App().Flash().Clear()
opts.Timeout = a 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 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 opts.DeleteEmptyDirData = v
}) })
f.AddCheckbox("Force:", defaults.Force, func(_ string, v bool) { f.AddCheckbox("Force:", opts.Force, func(_ string, v bool) {
opts.Force = v opts.Force = v
}) })