feat: 在启动时读取 kubectl context 中默认的 namespace

elfgzp · elfgzp · commit 0288d878645d · 2021-03-31T12:56:55.000+08:00
diff --git a/pkg/app/action.go b/pkg/app/action.go
@@ -170,17 +170,17 @@ var (
 	}
 
 	tailLogsAction = &guilib.Action{
-		Keys:            keyMap[tailLogsActionName],
-		Name:            tailLogsActionName,
-		Handler:         tailLogsHandler,
-		Mod:             gocui.ModNone,
+		Keys:    keyMap[tailLogsActionName],
+		Name:    tailLogsActionName,
+		Handler: tailLogsHandler,
+		Mod:     gocui.ModNone,
 	}
 
 	scrollLogsAction = &guilib.Action{
-		Keys:            keyMap[scrollLogsActionName],
-		Name:            scrollLogsActionName,
-		Handler:          scrollLogsHandler,
-		Mod:             gocui.ModNone,
+		Keys:    keyMap[scrollLogsActionName],
+		Name:    scrollLogsActionName,
+		Handler: scrollLogsHandler,
+		Mod:     gocui.ModNone,
 	}
 
 	runPodAction = &guilib.Action{
@@ -373,7 +373,7 @@ func switchNamespace(gui *guilib.Gui, selectedNamespaceLine string) {
 		log.Logger.Warningf("switchNamespace - detailView.SetOrigin(0, 0) error %s", err)
 	}
 	gui.ReRenderViews(resizeableViews...)
-	gui.ReRenderViews(navigationViewName, detailViewName)
+	gui.ReRenderViews(clusterInfoViewName, navigationViewName, detailViewName)
 }
 
 func newMoreActions(moreActions []*moreAction) *guilib.Action {
diff --git a/pkg/app/error.go b/pkg/app/error.go
@@ -5,4 +5,5 @@ import "errors"
 var (
 	resourceNotFoundErr   = errors.New("Resource not found. ")
 	noResourceSelectedErr = errors.New("No resource selected. ")
+	noNamespaceSelectedErr = errors.New("No namespace selected. ")
 )
diff --git a/pkg/app/handler.go b/pkg/app/handler.go
@@ -234,16 +234,16 @@ func getResourceNamespaceAndName(gui *guilib.Gui, resourceView *guilib.View) (na
 		if notResourceSelected(resourceName) {
 			return "", "", noResourceSelectedErr
 		}
-		return namespace, resourceName, nil
+		return kubecli.Cli.Namespace(), resourceName, nil
 	}
 
 	namespace = formatResourceName(selected, 0)
 	resourceName = formatResourceName(selected, 1)
 	if notResourceSelected(resourceName) {
-		return "", "", noResourceSelectedErr
+		return kubecli.Cli.Namespace(), "", noResourceSelectedErr
 	}
 
-	if namespace == "" {
+	if notResourceSelected(namespace) {
 		namespace = kubecli.Cli.Namespace()
 	}
 
diff --git a/pkg/app/panel.go b/pkg/app/panel.go
@@ -1,6 +1,7 @@
 package app
 
 import (
+	"errors"
 	"github.com/TNK-Studio/lazykube/pkg/config"
 	guilib "github.com/TNK-Studio/lazykube/pkg/gui"
 	"github.com/TNK-Studio/lazykube/pkg/kubecli"
@@ -179,6 +180,18 @@ var (
 				formatted = ""
 			}
 
+			_, err := view.GetState(iniDefaultNamespaceKey)
+			if err != nil {
+				if errors.Is(err, guilib.StateKeyError) {
+					ns := kubecli.Cli.Namespace()
+					if err := view.SetState(iniDefaultNamespaceKey, ns, false); err != nil {
+						return err
+					}
+					return nil
+				}
+				return err
+			}
+
 			if formatted == "" {
 				switchNamespace(gui, "")
 				return nil
diff --git a/pkg/app/render.go b/pkg/app/render.go
@@ -259,8 +259,9 @@ func navigationOnClick(gui *guilib.Gui, view *guilib.View) error {
 func renderClusterInfo(_ *guilib.Gui, view *guilib.View) error {
 	view.Clear()
 	currentContext := kubecli.Cli.CurrentContext()
+	currentNs := kubecli.Cli.Namespace()
 
-	if _, err := fmt.Fprintf(view, "Current Context: %s", color.Green.Sprint(currentContext)); err != nil {
+	if _, err := fmt.Fprintf(view, "Current Context: %s Namespace: %s", color.Green.Sprint(currentContext), color.Green.Sprint(currentNs)); err != nil {
 		return err
 	}
 	return nil
diff --git a/pkg/app/statekey.go b/pkg/app/statekey.go
@@ -1,14 +1,15 @@
 package app
 
 const (
-	viewLastRenderTimeStateKey    = "viewLastRenderTime" // value type: time.Time
-	cpuPlotStateKey               = "cpuPlot"            // value type: *gui.Plot
-	memoryPlotStateKey            = "memoryPlot"         // value type: *gui.Plot
-	moreActionTriggerViewStateKey = "triggerView"        // value type: *gui.View
-	filterInputValueStateKey      = "filterInputValue"   // value type: string
-	confirmValueStateKey          = "confirmValue"       // value type: string
-	logSinceTimeStateKey          = "logSinceTime"       // value type: time.Time
-	ScrollingLogsStateKey         = "scrollingLogs"      // value type: boolean
-	podContainersStateKey         = "podContainers"      // value type: []string
-	logContainerStateKey          = "logContainer"       // value type: string
+	viewLastRenderTimeStateKey    = "viewLastRenderTime"  // value type: time.Time
+	cpuPlotStateKey               = "cpuPlot"             // value type: *gui.Plot
+	memoryPlotStateKey            = "memoryPlot"          // value type: *gui.Plot
+	moreActionTriggerViewStateKey = "triggerView"         // value type: *gui.View
+	filterInputValueStateKey      = "filterInputValue"    // value type: string
+	confirmValueStateKey          = "confirmValue"        // value type: string
+	logSinceTimeStateKey          = "logSinceTime"        // value type: time.Time
+	ScrollingLogsStateKey         = "scrollingLogs"       // value type: boolean
+	podContainersStateKey         = "podContainers"       // value type: []string
+	logContainerStateKey          = "logContainer"        // value type: string
+	iniDefaultNamespaceKey        = "iniDefaultNamespace" // value type: string
 )
diff --git a/pkg/kubecli/config/current_context.go b/pkg/kubecli/config/current_context.go
@@ -26,9 +26,18 @@ func SetCurrentContext(context string) {
 	config.CurrentContext = context
 }
 
+func ContextNamespace() string {
+	ctx, ok := config.Contexts[config.CurrentContext]
+	if !ok {
+		return ""
+	}
+	ns := ctx.Namespace
+	return ns
+}
+
 func ListContexts() []string {
 	contexts := make([]string, 0)
-	for name, _ := range config.Contexts {
+	for name := range config.Contexts {
 		contexts = append(contexts, name)
 	}
 	return contexts
diff --git a/pkg/kubecli/kubecli.go b/pkg/kubecli/kubecli.go
@@ -63,7 +63,7 @@ func (c *Cmd) SetFlag(name, value string) *Cmd {
 }
 
 func NewKubeCLI() *KubeCLI {
-	namespace := ""
+	namespace := config.ContextNamespace()
 	context := config.CurrentContext()
 	kubeConfigFlags := genericclioptions.NewConfigFlags(true).WithDeprecatedPasswordFlag()
 	kubeConfigFlags.Namespace = &namespace

Original file line number	Diff line number	Diff line change
`@@ -5,4 +5,5 @@ import "errors"`
`5`	`5`	`var (`
`6`	`6`	`resourceNotFoundErr = errors.New("Resource not found. ")`
`7`	`7`	`noResourceSelectedErr = errors.New("No resource selected. ")`
	`8`	`+ noNamespaceSelectedErr = errors.New("No namespace selected. ")`
`8`	`9`	`)`
Original file line number	Diff line number	Diff line change
`@@ -234,16 +234,16 @@ func getResourceNamespaceAndName(gui guilib.Gui, resourceView guilib.View) (na`
`234`	`234`	`if notResourceSelected(resourceName) {`
`235`	`235`	`return "", "", noResourceSelectedErr`
`236`	`236`	`}`
`237`		`- return namespace, resourceName, nil`
	`237`	`+ return kubecli.Cli.Namespace(), resourceName, nil`
`238`	`238`	`}`
`239`	`239`
`240`	`240`	`namespace = formatResourceName(selected, 0)`
`241`	`241`	`resourceName = formatResourceName(selected, 1)`
`242`	`242`	`if notResourceSelected(resourceName) {`
`243`		`- return "", "", noResourceSelectedErr`
	`243`	`+ return kubecli.Cli.Namespace(), "", noResourceSelectedErr`
`244`	`244`	`}`
`245`	`245`
`246`		`- if namespace == "" {`
	`246`	`+ if notResourceSelected(namespace) {`
`247`	`247`	`namespace = kubecli.Cli.Namespace()`
`248`	`248`	`}`
`249`	`249`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ func (c Cmd) SetFlag(name, value string) Cmd {`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`func NewKubeCLI() *KubeCLI {`
`66`		`- namespace := ""`
	`66`	`+ namespace := config.ContextNamespace()`
`67`	`67`	`context := config.CurrentContext()`
`68`	`68`	`kubeConfigFlags := genericclioptions.NewConfigFlags(true).WithDeprecatedPasswordFlag()`
`69`	`69`	`kubeConfigFlags.Namespace = &namespace`