feat: set klog's verbosity & update help info (#62)

* feat: set klog's verbosity & update help info

Signed-off-by: Jian Zeng <[email protected]>

* chore: update go.mod

Signed-off-by: Jian Zeng <[email protected]>

---------

Signed-off-by: Jian Zeng <[email protected]>

Author: knight42

cmd/client/main.go

@@ -4,10 +4,12 @@ import (
 	"context"
 	"encoding/json"
 	"errors"
+	"flag"
 	"fmt"
 	"log/slog"
 	"os"
 	"os/signal"
+	"strconv"
 	"strings"
 	"time"
 
@@ -21,6 +23,7 @@ import (
 	"k8s.io/client-go/kubernetes/scheme"
 	_ "k8s.io/client-go/plugin/pkg/client/auth"
 	"k8s.io/client-go/rest"
+	"k8s.io/klog/v2"
 
 	"github.com/knight42/krelay/pkg/constants"
 	"github.com/knight42/krelay/pkg/ports"
@@ -296,11 +299,17 @@ func main() {
 	}
 	printVersion := false
 
+	fs := flag.NewFlagSet("klog", flag.ExitOnError)
+	klog.InitFlags(fs)
+
 	c := cobra.Command{
 		Use:     fmt.Sprintf(`%s TYPE/NAME [options] [LOCAL_PORT:]REMOTE_PORT[@PROTOCOL] [...[LOCAL_PORT_N:]REMOTE_PORT_N[@PROTOCOL_N]]`, getProgramName()),
 		Example: example(),
 		Long: `This command is similar to "kubectl port-forward", but it also supports UDP and could forward data to a
-service, ip and hostname rather than only pods.`,
+service, ip and hostname rather than only pods.
+
+Starting from version v0.1.2, it attempts to tunnel SPDY through websocket, in line with how "kubectl port-forward" works.
+This behavior can be disabled by setting the environment variable "KUBECTL_PORT_FORWARD_WEBSOCKETS" to "false".`,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			if printVersion {
 				return json.NewEncoder(cmd.OutOrStdout()).Encode(struct {
@@ -314,6 +323,7 @@ service, ip and hostname rather than only pods.`,
 				})
 			}
 
+			_ = fs.Set("v", strconv.Itoa(o.verbosity))
 			slog.SetLogLoggerLevel(slogutil.MapVerbosityToLogLevel(o.verbosity))
 			ctx, cancel := signal.NotifyContext(context.Background(), os.Interrupt)
 			defer cancel()

cmd/client/template.go

@@ -9,10 +9,11 @@ import (
 )
 
 func getProgramName() string {
-	if strings.HasPrefix(filepath.Base(os.Args[0]), "kubectl-") {
+	name := filepath.Base(os.Args[0])
+	if strings.HasPrefix(name, "kubectl-") {
 		return "kubectl relay"
 	}
-	return "krelay"
+	return name
 }
 
 func example() string {

go.mod

@@ -10,6 +10,7 @@ require (
 	k8s.io/apimachinery v0.31.0
 	k8s.io/cli-runtime v0.31.0
 	k8s.io/client-go v0.31.0
+	k8s.io/klog/v2 v2.130.1
 )
 
 require (
@@ -65,7 +66,6 @@ require (
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/klog/v2 v2.130.1 // indirect
 	k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
 	k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect