Skip to content

[v13] Deflake TestListKube #32082

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
GavinFrazar merged 1 commit into from
Sep 18, 2023
Merged

[v13] Deflake TestListKube #32082

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion tool/tsh/access_request.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@ func onRequestSearch(cf *CLIConf) error {

// If KubeCluster not provided try to read it from kubeconfig.
if cf.KubernetesCluster == "" {
cf.KubernetesCluster = selectedKubeCluster(tc.SiteName)
cf.KubernetesCluster = selectedKubeCluster(tc.SiteName, getKubeConfigPath(cf, ""))
}
if cf.ResourceKind == types.KindKubePod && cf.KubernetesCluster == "" {
return trace.BadParameter("when searching for Pods, --kube-cluster cannot be empty")
Expand Down
7 changes: 4 additions & 3 deletions tool/tsh/kube.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -974,7 +974,7 @@ func (c *kubeLSCommand) run(cf *CLIConf) error {
return trace.Wrap(err)
}

selectedCluster := selectedKubeCluster(currentTeleportCluster)
selectedCluster := selectedKubeCluster(currentTeleportCluster, getKubeConfigPath(cf, ""))
format := strings.ToLower(c.format)
switch format {
case teleport.Text, "":
Expand Down Expand Up @@ -1121,8 +1121,9 @@ func serializeKubeListings(kubeListings []kubeListing, format string) (string, e
return string(out), trace.Wrap(err)
}

func selectedKubeCluster(currentTeleportCluster string) string {
kc, err := kubeconfig.Load("")
// selectedKubeCluster determines which kube cluster, if any, is selected.
func selectedKubeCluster(currentTeleportCluster string, kubeconfgPath string) string {
kc, err := kubeconfig.Load(kubeconfgPath)
if err != nil {
log.WithError(err).Warning("Failed parsing existing kubeconfig")
return ""
Expand Down
5 changes: 5 additions & 0 deletions tool/tsh/kube_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,11 @@ func (p *kubeTestPack) testListKube(t *testing.T) {
tc.args...,
),
setCopyStdout(captureStdout),

// set a custom empty kube config for each test, as we do
// not want parallel (or even shuffled sequential) tests
// potentially racing on the same config
setKubeConfigPath(filepath.Join(t.TempDir(), "kubeconfig")),
)
require.NoError(t, err)
require.Contains(t, captureStdout.String(), tc.wantTable())
Expand Down
13 changes: 9 additions & 4 deletions tool/tsh/tsh.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -609,7 +609,12 @@ func initLogger(cf *CLIConf) {
}
}

// Run executes TSH client. same as main() but easier to test
// Run executes TSH client. same as main() but easier to test. Note that this
// function modifies global state in `tsh` (e.g. the system logger), and WILL
// ALSO MODIFY EXTERNAL SHARED STATE in its default configuration (e.g. the
// $HOME/.tsh dir, $KUBECONFIG, etc).
//
// DO NOT RUN TESTS that call Run() in parallel (unless you taken precautions).
func Run(ctx context.Context, args []string, opts ...cliOption) error {
cf := CLIConf{
Context: ctx,
Expand Down Expand Up @@ -4185,7 +4190,7 @@ func makeProfileInfo(p *client.ProfileStatus, env map[string]string, isActive bo
Traits: p.Traits,
Logins: logins,
KubernetesEnabled: p.KubeEnabled,
KubernetesCluster: selectedKubeCluster(p.Cluster),
KubernetesCluster: selectedKubeCluster(p.Cluster, ""),
KubernetesUsers: p.KubeUsers,
KubernetesGroups: p.KubeGroups,
Databases: p.DatabaseServices(),
Expand Down Expand Up @@ -4652,7 +4657,7 @@ func onEnvironment(cf *CLIConf) error {
fmt.Printf("unset %v\n", kubeClusterEnvVar)
fmt.Printf("unset %v\n", teleport.EnvKubeConfig)
case !cf.unsetEnvironment:
kubeName := selectedKubeCluster(profile.Cluster)
kubeName := selectedKubeCluster(profile.Cluster, "")
fmt.Printf("export %v=%v\n", proxyEnvVar, profile.ProxyURL.Host)
fmt.Printf("export %v=%v\n", clusterEnvVar, profile.Cluster)
if kubeName != "" {
Expand All @@ -4677,7 +4682,7 @@ func serializeEnvironment(profile *client.ProfileStatus, format string) (string,
proxyEnvVar: profile.ProxyURL.Host,
clusterEnvVar: profile.Cluster,
}
kubeName := selectedKubeCluster(profile.Cluster)
kubeName := selectedKubeCluster(profile.Cluster, "")
if kubeName != "" {
env[kubeClusterEnvVar] = kubeName
env[teleport.EnvKubeConfig] = profile.KubeConfigPath(kubeName)
Expand Down