Merge pull request #889 from YaoZengzeng/cd

implement `kmeshctl dump`

Author: kmesh-bot

ctl/dump/dump.go

@@ -0,0 +1,87 @@
+/*
+ * Copyright The Kmesh Authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package dump
+
+import (
+	"fmt"
+	"io"
+	"net/http"
+	"os"
+
+	"github.com/spf13/cobra"
+
+	"kmesh.net/kmesh/ctl/utils"
+	"kmesh.net/kmesh/pkg/logger"
+)
+
+const (
+	configDumpPrefix = "/debug/config_dump"
+)
+
+var log = logger.NewLoggerScope("kmeshctl/dump")
+
+func NewCmd() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "dump",
+		Short: "Dump config of ads or workload mode",
+		Example: `# Ads mode:
+kmeshctl dump <kmesh-daemon-pod> ads
+	  
+# Workload mode:
+kmeshctl dump <kmesh-daemon-pod> workload`,
+		Args: cobra.ExactArgs(2),
+		Run: func(cmd *cobra.Command, args []string) {
+			_ = RunDump(cmd, args)
+		},
+	}
+	return cmd
+}
+
+func RunDump(cmd *cobra.Command, args []string) error {
+	podName := args[0]
+	mode := args[1]
+	if mode != "ads" && mode != "workload" {
+		log.Errorf("Error: Argument must be 'ads' or 'workload'")
+		os.Exit(1)
+	}
+
+	fw, err := utils.CreateKmeshPortForwarder(podName)
+	if err != nil {
+		log.Errorf("failed to create port forwarder for Kmesh daemon pod %s: %v", podName, err)
+		os.Exit(1)
+	}
+	if err := fw.Start(); err != nil {
+		log.Errorf("failed to start port forwarder for Kmesh daemon pod %s: %v", podName, err)
+	}
+
+	url := fmt.Sprintf("http://%s%s/%s", fw.Address(), configDumpPrefix, mode)
+	resp, err := http.Get(url)
+	if err != nil {
+		log.Errorf("failed to make HTTP request: %v", err)
+		os.Exit(1)
+	}
+	defer resp.Body.Close()
+
+	body, err := io.ReadAll(resp.Body)
+	if err != nil {
+		fmt.Printf("failed to read HTTP response body: %v\n", err)
+		os.Exit(1)
+	}
+
+	fmt.Println(string(body))
+	return nil
+}

ctl/log/log.go

@@ -26,15 +26,12 @@ import (
 	"strings"
 
 	"github.com/spf13/cobra"
-	"istio.io/istio/pkg/kube"
 
+	"kmesh.net/kmesh/ctl/utils"
 	"kmesh.net/kmesh/pkg/logger"
 )
 
 const (
-	KmeshNamespace = "kmesh-system"
-	KmeshAdminPort = 15200
-
 	patternLoggers = "/debug/loggers"
 )
 
@@ -142,7 +139,7 @@ func SetLoggerLevel(url string, setFlag string) {
 	client := &http.Client{}
 	resp, err := client.Do(req)
 	if err != nil {
-		log.Errorf("Error making request: %v", err)
+		log.Errorf("failed to make HTTP request: %v", err)
 		return
 	}
 	defer resp.Body.Close()
@@ -154,34 +151,22 @@ func SetLoggerLevel(url string, setFlag string) {
 
 	body, err := io.ReadAll(resp.Body)
 	if err != nil {
-		log.Errorf("Error reading response body: %v", err)
+		log.Errorf("failed to read HTTP response body: %v", err)
 		return
 	}
 	fmt.Println(string(body))
 }
 
 func RunGetOrSetLoggerLevel(cmd *cobra.Command, args []string) {
-	rc, err := kube.DefaultRestConfig("", "")
-	if err != nil {
-		log.Errorf("failed to get rest.Config for given kube config file and context: %v", err)
-		os.Exit(1)
-	}
-
-	cli, err := kube.NewCLIClient(kube.NewClientConfigForRestConfig(rc))
-	if err != nil {
-		log.Errorf("failed to create kube client: %v", err)
-		os.Exit(1)
-	}
-
 	podName := args[0]
 
-	fw, err := cli.NewPortForwarder(podName, KmeshNamespace, "", 0, KmeshAdminPort)
+	fw, err := utils.CreateKmeshPortForwarder(podName)
 	if err != nil {
-		log.Errorf("failed to create port forwarder: %v", err)
+		log.Errorf("failed to create port forwarder for Kmesh daemon pod %s: %v", podName, err)
 		os.Exit(1)
 	}
 	if err := fw.Start(); err != nil {
-		log.Errorf("failed to start port forwarder: %v", err)
+		log.Errorf("failed to start port forwarder for Kmesh daemon pod %s: %v", podName, err)
 		os.Exit(1)
 	}
 	defer fw.Close()

ctl/main.go

@@ -21,6 +21,7 @@ import (
 
 	"github.com/spf13/cobra"
 
+	"kmesh.net/kmesh/ctl/dump"
 	logcmd "kmesh.net/kmesh/ctl/log"
 )
 
@@ -35,6 +36,7 @@ func main() {
 	}
 
 	rootCmd.AddCommand(logcmd.NewCmd())
+	rootCmd.AddCommand(dump.NewCmd())
 
 	if err := rootCmd.Execute(); err != nil {
 		os.Exit(1)

ctl/utils/portforwarder.go

@@ -0,0 +1,48 @@
+/*
+ * Copyright The Kmesh Authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package utils
+
+import (
+	"fmt"
+
+	"istio.io/istio/pkg/kube"
+)
+
+const (
+	KmeshNamespace = "kmesh-system"
+	KmeshAdminPort = 15200
+)
+
+// Create a new PortForwarder configured for the given Kmesh daemon pod.
+func CreateKmeshPortForwarder(podName string) (kube.PortForwarder, error) {
+	rc, err := kube.DefaultRestConfig("", "")
+	if err != nil {
+		return nil, fmt.Errorf("failed to get rest.Config for given kube config file and context: %v", err)
+	}
+
+	cli, err := kube.NewCLIClient(kube.NewClientConfigForRestConfig(rc))
+	if err != nil {
+		return nil, fmt.Errorf("failed to create kube client: %v", err)
+	}
+
+	fw, err := cli.NewPortForwarder(podName, KmeshNamespace, "", 0, KmeshAdminPort)
+	if err != nil {
+		return nil, fmt.Errorf("failed to create port forwarder: %v", err)
+	}
+
+	return fw, nil
+}

daemon/manager/dump/dump.go

@@ -27,7 +27,6 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 
-	"kmesh.net/kmesh/daemon/manager/dump"
 	"kmesh.net/kmesh/daemon/manager/uninstall"
 	"kmesh.net/kmesh/daemon/manager/version"
 	"kmesh.net/kmesh/daemon/options"
@@ -69,7 +68,6 @@ func NewCommand() *cobra.Command {
 
 	// add sub commands
 	cmd.AddCommand(version.NewCmd())
-	cmd.AddCommand(dump.NewCmd())
 	cmd.AddCommand(uninstall.NewCmd())
 
 	return cmd