Skip to content
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

Jump to bottom

Fix tsh kube login when creds are expired or doesn't exist #31418

Merged
merged 1 commit into from
Sep 5, 2023
Merged

Fix tsh kube login when creds are expired or doesn't exist #31418

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
32 changes: 17 additions & 15 deletions tool/tsh/common/kube.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1245,22 +1245,24 @@ func (c *kubeLoginCommand) run(cf *CLIConf) error {

var kubeStatus *kubernetesStatus
err = retryWithAccessRequest(cf, tc, func() error {
// Check that this kube cluster exists.
var err error
kubeStatus, err = fetchKubeStatus(cf.Context, tc)
if err != nil {
return trace.Wrap(err)
}
err = c.checkClusterSelection(cf, tc, kubeStatus.kubeClusters)
if err != nil {
if trace.IsNotFound(err) {
// rewrap not found error as access denied, so we can retry
// fetching clusters with an access request.
return trace.AccessDenied(err.Error())
return client.RetryWithRelogin(cf.Context, tc, func() error {
// Check that this kube cluster exists.
var err error
kubeStatus, err = fetchKubeStatus(cf.Context, tc)
if err != nil {
return trace.Wrap(err)
}
return trace.Wrap(err)
}
return nil
err = c.checkClusterSelection(cf, tc, kubeStatus.kubeClusters)
if err != nil {
if trace.IsNotFound(err) {
// rewrap not found error as access denied, so we can retry
// fetching clusters with an access request.
return trace.AccessDenied(err.Error())
}
return trace.Wrap(err)
}
return nil
})
}, c.accessRequestForKubeCluster, c.selectorsOrWildcard())
if err != nil {
return trace.Wrap(err)
Expand Down