Skip to content

Connect: Fix premature proxyClient.Close() when getting kube clusters #16538

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
gzdunek merged 5 commits into from
Sep 21, 2022
Merged

Connect: Fix premature proxyClient.Close() when getting kube clusters #16538

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
57e2a67
Connect: Fix premature proxyClient.Close() when getting kube clusters
gzdunek Sep 20, 2022
e915029
Merge branch 'master' into gzdunek/premature-kube-proxy-client-close
gzdunek Sep 20, 2022
c81c5dc
Merge branch 'master' into gzdunek/premature-kube-proxy-client-close
gzdunek Sep 20, 2022
7e63e7d
Merge branch 'master' into gzdunek/premature-kube-proxy-client-close
gzdunek Sep 20, 2022
fc8fdf5
Merge branch 'master' into gzdunek/premature-kube-proxy-client-close
gzdunek Sep 21, 2022
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
18 changes: 11 additions & 7 deletions lib/teleterm/clusters/cluster_kubes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import (

"github.com/gravitational/teleport/api/types"
"github.com/gravitational/teleport/lib/auth"
"github.com/gravitational/teleport/lib/client"
"github.com/gravitational/teleport/lib/teleterm/api/uri"

"github.com/gravitational/trace"
Expand All @@ -37,14 +38,11 @@ type Kube struct {
// GetKubes returns kube services
func (c *Cluster) GetKubes(ctx context.Context) ([]Kube, error) {
var authClient auth.ClientI
err := addMetadataToRetryableError(ctx, func() error {
proxyClient, err := c.clusterClient.ConnectToProxy(ctx)
if err != nil {
return trace.Wrap(err)
}
defer proxyClient.Close()
var proxyClient *client.ProxyClient
var err error

authClient, err = proxyClient.ConnectToCluster(ctx, c.clusterClient.SiteName)
err = addMetadataToRetryableError(ctx, func() error {
proxyClient, err = c.clusterClient.ConnectToProxy(ctx)
if err != nil {
return trace.Wrap(err)
}
Expand All @@ -54,6 +52,12 @@ func (c *Cluster) GetKubes(ctx context.Context) ([]Kube, error) {
if err != nil {
return nil, trace.Wrap(err)
}
defer proxyClient.Close()

authClient, err = proxyClient.ConnectToCluster(ctx, c.clusterClient.SiteName)
if err != nil {
return nil, trace.Wrap(err)
}

defer authClient.Close()

Expand Down