github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 14:07:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #7502 from piosz/kubectl

Browse Source 
Updated kubectl cluster-info to show v1beta3 addresses
This commit is contained in:
Wojciech Tyczynski 2015-04-29 15:06:28 +02:00
commit 467d5924b2
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/kubectl/cmd/clusterinfo.go
View File

@ -20,7 +20,6 @@ import (
"fmt" "fmt"
"io" "io"
"os" "os"
"strings"
"github.com/GoogleCloudPlatform/kubernetes/pkg/api" "github.com/GoogleCloudPlatform/kubernetes/pkg/api"
cmdutil "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/cmd/util" cmdutil "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/cmd/util"
@ -54,7 +53,7 @@ func RunClusterInfo(factory *cmdutil.Factory, out io.Writer, cmd *cobra.Command)
if err != nil { if err != nil {
return err return err
} }
printService(out, "Kubernetes master", client.Host, false) printService(out, "Kubernetes master", client.Host)
mapper, typer := factory.Object() mapper, typer := factory.Object()
cmdNamespace, err := factory.DefaultNamespace() cmdNamespace, err := factory.DefaultNamespace()
@ -71,13 +70,8 @@ func RunClusterInfo(factory *cmdutil.Factory, out io.Writer, cmd *cobra.Command)
b.Do().Visit(func(r *resource.Info) error { b.Do().Visit(func(r *resource.Info) error {
services := r.Object.(*api.ServiceList).Items services := r.Object.(*api.ServiceList).Items
for _, service := range services { for _, service := range services {
splittedLink := strings.Split(strings.Split(service.ObjectMeta.SelfLink, "?")[0], "/") link := client.Host + "/api/v1beta3/proxy/namespaces/" + service.ObjectMeta.Namespace + "/services/" + service.ObjectMeta.Name
// insert "proxy" into the link printService(out, service.ObjectMeta.Labels["name"], link)
splittedLink = append(splittedLink, "")
copy(splittedLink[4:], splittedLink[3:])
splittedLink[3] = "proxy"
link := client.Host + strings.Join(splittedLink, "/") + "/"
printService(out, service.ObjectMeta.Labels["name"], link, true)
} }
return nil return nil
}) })
@ -86,7 +80,7 @@ func RunClusterInfo(factory *cmdutil.Factory, out io.Writer, cmd *cobra.Command)
// TODO consider printing more information about cluster // TODO consider printing more information about cluster
} }
func printService(out io.Writer, name, link string, warn bool) { func printService(out io.Writer, name, link string) {
ct.ChangeColor(ct.Green, false, ct.None, false) ct.ChangeColor(ct.Green, false, ct.None, false)
fmt.Fprint(out, name) fmt.Fprint(out, name)
ct.ResetColor() ct.ResetColor()
@ -94,9 +88,5 @@ func printService(out io.Writer, name, link string, warn bool) {
ct.ChangeColor(ct.Yellow, false, ct.None, false) ct.ChangeColor(ct.Yellow, false, ct.None, false)
fmt.Fprint(out, link) fmt.Fprint(out, link)
ct.ResetColor() ct.ResetColor()
// TODO remove this warn once trailing slash is no longer required
if warn {
fmt.Fprint(out, " (note the trailing slash)")
}
fmt.Fprintln(out, "") fmt.Fprintln(out, "")
} }