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

Always prefer multiplex port if Kube Proxy endpoint is specified #34211

Merged
merged 1 commit into from Dec 4, 2023

Conversation

tigrato
Copy link
Contributor

@tigrato tigrato commented Nov 3, 2023

This PR changes the default behavior of tsh login -f kubeconfig -o ./kubeconfig --kube-cluster <kube_cluster> to prefer the multiplex port instead of the Kubernetes public address if specified.

Changelog: Always prefer multiplex port for Kubernetes Access

Signed-off-by: Tiago Silva <tiago.silva@goteleport.com>
@tigrato tigrato marked this pull request as ready for review November 6, 2023 09:55
@github-actions github-actions bot added size/sm tsh tsh - Teleport's command line tool for logging into nodes running Teleport. labels Nov 6, 2023
@tigrato
Copy link
Contributor Author

tigrato commented Nov 21, 2023

@hugoShaka friendly ping!

@tigrato tigrato added this pull request to the merge queue Dec 4, 2023
Merged via the queue into master with commit ed74828 Dec 4, 2023
41 of 42 checks passed
@tigrato tigrato deleted the tigrato/always-prefer-multiplex branch December 4, 2023 19:52
@public-teleport-github-review-bot

@tigrato See the table below for backport results.

Branch Result
branch/v12 Failed
branch/v13 Create PR
branch/v14 Create PR

tigrato added a commit that referenced this pull request Dec 11, 2023
This PR fixes a regression introduced by #34211 where the Kube server
address was using the incorrect port when doing `tsh kube login`.

Changelog: Fixes regression of Kubernetes Server Address when Teleport
runs in multiplex mode.

Signed-off-by: Tiago Silva <tiago.silva@goteleport.com>
github-merge-queue bot pushed a commit that referenced this pull request Dec 11, 2023
* Fix regression in Kube Address introduced by #34211

This PR fixes a regression introduced by #34211 where the Kube server
address was using the incorrect port when doing `tsh kube login`.

Changelog: Fixes regression of Kubernetes Server Address when Teleport
runs in multiplex mode.

Signed-off-by: Tiago Silva <tiago.silva@goteleport.com>

* Update tool/tsh/common/kube_test.go

Co-authored-by: rosstimothy <39066650+rosstimothy@users.noreply.github.com>

---------

Signed-off-by: Tiago Silva <tiago.silva@goteleport.com>
Co-authored-by: rosstimothy <39066650+rosstimothy@users.noreply.github.com>
github-actions bot pushed a commit that referenced this pull request Dec 11, 2023
This PR fixes a regression introduced by #34211 where the Kube server
address was using the incorrect port when doing `tsh kube login`.

Changelog: Fixes regression of Kubernetes Server Address when Teleport
runs in multiplex mode.

Signed-off-by: Tiago Silva <tiago.silva@goteleport.com>
tigrato added a commit that referenced this pull request Dec 11, 2023
* Fix regression in Kube Address introduced by #34211

This PR fixes a regression introduced by #34211 where the Kube server
address was using the incorrect port when doing `tsh kube login`.

Changelog: Fixes regression of Kubernetes Server Address when Teleport
runs in multiplex mode.

Signed-off-by: Tiago Silva <tiago.silva@goteleport.com>

* Update tool/tsh/common/kube_test.go

Co-authored-by: rosstimothy <39066650+rosstimothy@users.noreply.github.com>

---------

Signed-off-by: Tiago Silva <tiago.silva@goteleport.com>
Co-authored-by: rosstimothy <39066650+rosstimothy@users.noreply.github.com>
github-merge-queue bot pushed a commit that referenced this pull request Dec 11, 2023
* Fix regression in Kube Address introduced by #34211

This PR fixes a regression introduced by #34211 where the Kube server
address was using the incorrect port when doing `tsh kube login`.

Changelog: Fixes regression of Kubernetes Server Address when Teleport
runs in multiplex mode.

Signed-off-by: Tiago Silva <tiago.silva@goteleport.com>

* Update tool/tsh/common/kube_test.go

Co-authored-by: rosstimothy <39066650+rosstimothy@users.noreply.github.com>

---------

Signed-off-by: Tiago Silva <tiago.silva@goteleport.com>
Co-authored-by: rosstimothy <39066650+rosstimothy@users.noreply.github.com>
github-merge-queue bot pushed a commit that referenced this pull request Dec 11, 2023
* Fix regression in Kube Address introduced by #34211

This PR fixes a regression introduced by #34211 where the Kube server
address was using the incorrect port when doing `tsh kube login`.

Changelog: Fixes regression of Kubernetes Server Address when Teleport
runs in multiplex mode.



* Update tool/tsh/common/kube_test.go



---------

Signed-off-by: Tiago Silva <tiago.silva@goteleport.com>
Co-authored-by: rosstimothy <39066650+rosstimothy@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport/branch/v12 backport/branch/v13 backport/branch/v14 size/sm tsh tsh - Teleport's command line tool for logging into nodes running Teleport.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants