From c73b97c36ee7ef40792788958af2f624cd52ab72 Mon Sep 17 00:00:00 2001 From: Jayson Wang Date: Fri, 16 Aug 2024 08:28:26 +0800 Subject: [PATCH] should switching ctx before ns (#2750) --- internal/view/command.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/internal/view/command.go b/internal/view/command.go index 318f8f42f0..bb81826c26 100644 --- a/internal/view/command.go +++ b/internal/view/command.go @@ -160,14 +160,6 @@ func (c *Command) run(p *cmd.Interpreter, fqn string, clearStack bool) error { return err } - ns := c.app.Config.ActiveNamespace() - if cns, ok := p.NSArg(); ok { - ns = cns - } - if err := c.app.switchNS(ns); err != nil { - return err - } - if context, ok := p.HasContext(); ok { if context != c.app.Config.ActiveContextName() { if err := c.app.Config.Save(true); err != nil { @@ -193,6 +185,14 @@ func (c *Command) run(p *cmd.Interpreter, fqn string, clearStack bool) error { } } + ns := c.app.Config.ActiveNamespace() + if cns, ok := p.NSArg(); ok { + ns = cns + } + if err := c.app.switchNS(ns); err != nil { + return err + } + co := c.componentFor(gvr, fqn, v) co.SetFilter("") co.SetLabelFilter(nil)