Skip to content

Commit

Permalink
Merge pull request #901 from YaoZengzeng/waypoint
Browse files Browse the repository at this point in the history
`kmeshctl waypoint` framework
  • Loading branch information
kmesh-bot authored Sep 30, 2024
2 parents 33e6220 + 33ed0dd commit c9634e1
Show file tree
Hide file tree
Showing 4 changed files with 652 additions and 7 deletions.
2 changes: 2 additions & 0 deletions ctl/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (

"kmesh.net/kmesh/ctl/dump"
logcmd "kmesh.net/kmesh/ctl/log"
"kmesh.net/kmesh/ctl/waypoint"
)

func main() {
Expand All @@ -37,6 +38,7 @@ func main() {

rootCmd.AddCommand(logcmd.NewCmd())
rootCmd.AddCommand(dump.NewCmd())
rootCmd.AddCommand(waypoint.NewCmd())

if err := rootCmd.Execute(); err != nil {
os.Exit(1)
Expand Down
21 changes: 15 additions & 6 deletions ctl/utils/portforwarder.go → ctl/utils/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,20 @@ const (

// Create a new PortForwarder configured for the given Kmesh daemon pod.
func CreateKmeshPortForwarder(podName string) (kube.PortForwarder, error) {
cli, err := CreateKubeClient()
if err != nil {
return nil, 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
}

func CreateKubeClient() (kube.CLIClient, 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)
Expand All @@ -39,10 +53,5 @@ func CreateKmeshPortForwarder(podName string) (kube.PortForwarder, error) {
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
return cli, nil
}
Loading

0 comments on commit c9634e1

Please sign in to comment.