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

[v11] Fix tsh kube credentials may fail on remote cluster on 1st call #23353

Merged
merged 1 commit into from
Mar 21, 2023
Merged

[v11] Fix tsh kube credentials may fail on remote cluster on 1st call #23353

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 9 additions & 0 deletions lib/client/keyagent.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,6 +550,15 @@ func (a *LocalKeyAgent) AddDatabaseKey(key *Key) error {
return a.addKey(key)
}

// AddKubeKey activates a new signed Kubernetes key by adding it into the keystore.
// key must contain at least one Kubernetes cert. ssh cert is not required.
func (a *LocalKeyAgent) AddKubeKey(key *Key) error {
if len(key.KubeTLSCerts) == 0 {
return trace.BadParameter("key must contains at least one Kubernetes access certificate")
}
return a.addKey(key)
}

// addKey activates a new signed session key by adding it into the keystore.
func (a *LocalKeyAgent) addKey(key *Key) error {
if key == nil {
Expand Down
4 changes: 2 additions & 2 deletions tool/tsh/kube.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ func (c *kubeJoinCommand) run(cf *CLIConf) error {
}

// Cache the new cert on disk for reuse.
if err := tc.LocalAgent().AddKey(k); err != nil {
if err := tc.LocalAgent().AddKubeKey(k); err != nil {
return trace.Wrap(err)
}
}
Expand Down Expand Up @@ -616,7 +616,7 @@ func (c *kubeCredentialsCommand) run(cf *CLIConf) error {
return trace.Wrap(err)
}
// Cache the new cert on disk for reuse.
if err := tc.LocalAgent().AddKey(k); err != nil {
if err := tc.LocalAgent().AddKubeKey(k); err != nil {
return trace.Wrap(err)
}

Expand Down