Skip to content

[v14] [kube] Enhance tsh proxy kube output table with kubeconfig context name #47381

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tigrato merged 2 commits into from
Oct 9, 2024
Merged

[v14] [kube] Enhance tsh proxy kube output table with kubeconfig context name #47381

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4a9cb00
[kube] Enhance `tsh proxy kube` output table with kubeconfig context …
tigrato Oct 8, 2024
17d3db6
Update kube_proxy.go
tigrato Oct 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions lib/kube/kubeconfig/context_overwrite.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,3 +101,16 @@ func executeKubeContextTemplate(tmpl *template.Template, clusterName, kubeName s
err := tmpl.Execute(&buf, contextEntry)
return buf.String(), trace.Wrap(err)
}

// ContextNameFromTemplate generates a kubernetes context name from the given template.
func ContextNameFromTemplate(temp string, clusterName, kubeName string) (string, error) {
tmpl, err := parseContextOverrideTemplate(temp)
if err != nil {
return "", trace.Wrap(err)
}
if tmpl == nil {
return ContextName(clusterName, kubeName), nil
}
s, err := executeKubeContextTemplate(tmpl, clusterName, kubeName)
return s, trace.Wrap(err)
}
10 changes: 8 additions & 2 deletions tool/tsh/common/kube_proxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import (
"encoding/pem"
"fmt"
"io"
"log/slog"
"net"
"os"
"os/exec"
Expand Down Expand Up @@ -258,9 +259,14 @@ func (c *proxyKubeCommand) prepare(cf *CLIConf, tc *client.TeleportClient) (*cli

func (c *proxyKubeCommand) printPrepare(cf *CLIConf, title string, clusters kubeconfig.LocalProxyClusters) {
fmt.Fprintln(cf.Stdout(), title)
table := asciitable.MakeTable([]string{"Teleport Cluster Name", "Kube Cluster Name"})
table := asciitable.MakeTable([]string{"Teleport Cluster Name", "Kube Cluster Name", "Context Name"})
for _, cluster := range clusters {
table.AddRow([]string{cluster.TeleportCluster, cluster.KubeCluster})
contextName, err := kubeconfig.ContextNameFromTemplate(c.overrideContextName, cluster.TeleportCluster, cluster.KubeCluster)
if err != nil {
slog.WarnContext(cf.Context, "Failed to generate context name.", "error", err)
contextName = kubeconfig.ContextName(cluster.TeleportCluster, cluster.KubeCluster)
}
table.AddRow([]string{cluster.TeleportCluster, cluster.KubeCluster, contextName})
}
fmt.Fprintln(cf.Stdout(), table.AsBuffer().String())
}
Expand Down