diff --git a/references/cli/logs.go b/references/cli/logs.go index 78ab9b4d0..e9cc7b792 100644 --- a/references/cli/logs.go +++ b/references/cli/logs.go @@ -49,15 +49,6 @@ func NewLogsCommand(c common.Args, order string, ioStreams util.IOStreams) *cobr Short: "Tail logs for application.", Long: "Tail logs for vela application.", Args: cobra.ExactArgs(1), - PreRunE: func(cmd *cobra.Command, args []string) error { - config, err := c.GetConfig() - if err != nil { - return err - } - largs.Args = c - config.Wrap(multicluster.NewSecretModeMultiClusterRoundTripper) - return nil - }, RunE: func(cmd *cobra.Command, args []string) error { var err error largs.Namespace, err = GetFlagNamespaceOrEnv(cmd, c) @@ -104,15 +95,6 @@ type Args struct { // Run refer to the implementation at https://github.com/oam-dev/stern/blob/master/stern/main.go func (l *Args) Run(ctx context.Context, ioStreams util.IOStreams) error { - config, err := l.Args.GetConfig() - if err != nil { - return err - } - clientSet, err := kubernetes.NewForConfig(config) - if err != nil { - return err - } - pods, err := GetApplicationPods(ctx, l.App.Name, l.App.Namespace, l.Args, Filter{ Component: l.ComponentName, Cluster: l.ClusterName, @@ -162,6 +144,15 @@ func (l *Args) Run(ctx context.Context, ioStreams util.IOStreams) error { selector = selector.Add(*req) } } + + config, err := l.Args.GetConfig() + if err != nil { + return err + } + clientSet, err := kubernetes.NewForConfig(config) + if err != nil { + return err + } added, removed, err := stern.Watch(ctx, clientSet.CoreV1().Pods(namespace), pod, diff --git a/references/cli/velaql.go b/references/cli/velaql.go index ad7be943a..622aec5ce 100644 --- a/references/cli/velaql.go +++ b/references/cli/velaql.go @@ -28,6 +28,7 @@ import ( "github.com/oam-dev/kubevela/apis/types" "github.com/oam-dev/kubevela/pkg/cue/model/value" + "github.com/oam-dev/kubevela/pkg/multicluster" "github.com/oam-dev/kubevela/pkg/utils" "github.com/oam-dev/kubevela/pkg/utils/common" "github.com/oam-dev/kubevela/pkg/utils/util" @@ -370,6 +371,7 @@ func QueryValue(ctx context.Context, velaC common.Args, queryView *velaql.QueryV if err != nil { return nil, err } + config.Wrap(multicluster.NewSecretModeMultiClusterRoundTripper) client, err := velaC.GetClient() if err != nil { return nil, err