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.

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

check for discovered kube cluster name exact match #31744

Merged

Conversation

GavinFrazar
Copy link
Contributor

@GavinFrazar GavinFrazar commented Sep 12, 2023

related issue: #31286

changelog: tsh commands can select a Kubernetes cluster by the original cluster name instead of the more detailed name generated by the v14+ Teleport Discovery service.

This PR updates tsh kube for the same issue. Now if a discovered kube cluster name matches exactly, it is preferentially selected over prefix matches.

@GavinFrazar GavinFrazar added ux kubernetes-access tsh tsh - Teleport's command line tool for logging into nodes running Teleport. labels Sep 12, 2023
@GavinFrazar
Copy link
Contributor Author

@zmb3 flaky test detector is just timing out after 10m, please skip. The test cases are already in parallel, most test time is spent in setting up the test cluster

@zmb3
Copy link
Collaborator

zmb3 commented Sep 12, 2023

/excludeflake TestProxyKubeComplexSelectors

@GavinFrazar GavinFrazar added this pull request to the merge queue Sep 12, 2023
Merged via the queue into master with commit df5f18a Sep 12, 2023
@GavinFrazar GavinFrazar deleted the gavinfrazar/tsh-match-against-discovered-kube-name branch September 12, 2023 20:21
@public-teleport-github-review-bot

@GavinFrazar See the table below for backport results.

Branch Result
branch/v13 Failed
branch/v14 Create PR

GavinFrazar added a commit that referenced this pull request Sep 19, 2023
GavinFrazar added a commit that referenced this pull request Sep 19, 2023
github-merge-queue bot pushed a commit that referenced this pull request Sep 19, 2023
* [v13] Fix Kubernetes selected cluster

backports #30167 to branch/v13.

* Fix Kubernetes selected cluster

Kubeconfig context name can be customized using `--set-context-name`
flag. When using it, the selected Kubernetes cluster fails to correctly
identify the cluster name.

* [v13] tsh kube login by prefix, query, labels (#32088)

backports #30252 to branch/v13.

* fetch kube clusters once for login

* [v13] update `tsh proxy kube` cluster selection ux (#32089)

backports #30478 to branch/v13.

* select by labels, query predicate, name, and/or prefix of name.
* fix --cluster flag not being propagated

* [v13] simplify tsh db prefix predicate logic (#32090)

backports #30531 to branch/v13.

* [v13] check for discovered kube cluster name exact match (#32091)

backports #31744 to branch/v13.

* [v13] rework tsh database selection logic (#32092)

backports #31689 to branch/v13.

* disallow prefix matching
* select by exact name match first,
* otherwise look for unambiguous discovered name label match.
* look for an active db to resolve discovered name match ambiguity.
* add more predicate builder helpers
* check for db name in not found error for stale cert hint
* no error status on tsh db logout with no logged in dbs
* remove dead code
* refactor helper funcs to simplify code and make it easier to test
* test complex database selection
* test findActiveDatabase
* test choosing one db by discovered name
* add more resource selectors tests
* test formatDatabaseLoginCommand
* add debug logging for db selection

* [v13] Fix `tsh kube login` when creds are expired or doesn't exist (#32095)

Backports #31418 to branch/v13.

This PR uses `client.RetryWithRelogin` helper to deal with cases where user's
credentials don't exist or are already expired.

Co-authored-by: Tiago Silva <[email protected]>

* remove tsh kube prefix matching (#31852) (#32097)

* fix retry with relogin for ambiguous clusters
* consolidate test setup for login/proxy kube selection tests
* add more test cases for kube selection
* remove prefix testing
* add origin cloud label in tests
* refactor the check for multiple cluster login into a func

* [v13] remove prefix matching in tctl (#32104)

Backports #31916 to branch/v13.

* remove prefix matching in tctl
* replace prefix matching with exact discovered name match as a fallback
  when no resource full name matches the name given by a user
* refactor test helpers
* avoid decoding yaml/json into already initialized var

---------

Co-authored-by: Tiago Silva <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport/branch/v13 backport/branch/v14 kubernetes-access size/sm tsh tsh - Teleport's command line tool for logging into nodes running Teleport. ux
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants