github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Updated kubectl cluster-info to show v1beta3 addresses 

Fixes #7016
pull/6/head
Piotr Szczesniak 2015-04-29 10:54:36 +02:00
parent 7dcce2eeb7
commit 9272fe2aea
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"
"io"
"os"
"strings"
"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
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 {
return err
}
printService(out, "Kubernetes master", client.Host, false)
printService(out, "Kubernetes master", client.Host)
mapper, typer := factory.Object()
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 {
services := r.Object.(*api.ServiceList).Items
for _, service := range services {
splittedLink := strings.Split(strings.Split(service.ObjectMeta.SelfLink, "?")[0], "/")
// insert "proxy" into the 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)
link := client.Host + "/api/v1beta3/proxy/namespaces/" + service.ObjectMeta.Namespace + "/services/" + service.ObjectMeta.Name
printService(out, service.ObjectMeta.Labels["name"], link)
}
return nil
})
@ -86,7 +80,7 @@ func RunClusterInfo(factory *cmdutil.Factory, out io.Writer, cmd *cobra.Command)
// 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)
fmt.Fprint(out, name)
ct.ResetColor()
@ -94,9 +88,5 @@ func printService(out io.Writer, name, link string, warn bool) {
ct.ChangeColor(ct.Yellow, false, ct.None, false)
fmt.Fprint(out, link)
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, "")
}