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 Machine ID selection of Kubernetes Access address/port #34202

Merged
merged 9 commits into from
Nov 6, 2023
Merged

Fix Machine ID selection of Kubernetes Access address/port #34202

merged 9 commits into from
Nov 6, 2023

Conversation

strideynet
Copy link
Contributor

Closes #19811 / Semi-closes #34178

Addresses a few long standing issues w/ the selection of what address to use when tbot generates the kubeconfig file. This also feels a bit neater/more explicit than the previous code and I've also included more tests to cover this process since there's a few edgecases.

changelog: Fixes issue where tbot would select the wrong address for Kubernetes Access when in ports separate mode.

@strideynet
Copy link
Contributor Author

Backport will exclude the docs changes (b23d53a) and a separate PR will be raised when this change is released to include a note specifying the version this is fixed within.

@strideynet strideynet marked this pull request as ready for review November 3, 2023 13:46
@github-actions GitHub Actions
Copy link

github-actions bot commented Nov 3, 2023

🤖 Vercel preview here: https://docs-2bzf99jy2-goteleport.vercel.app/docs/ver/preview

@github-actions GitHub Actions
Copy link

github-actions bot commented Nov 3, 2023

🤖 Vercel preview here: https://docs-owf6bnt78-goteleport.vercel.app/docs/ver/preview

zmb3
zmb3 approved these changes Nov 3, 2023
View reviewed changes
lib/tbot/config/template_kubernetes.go Outdated Show resolved Hide resolved
@github-actions GitHub Actions
Copy link

github-actions bot commented Nov 3, 2023

🤖 Vercel preview here: https://docs-o3nc1dalo-goteleport.vercel.app/docs/ver/preview

@github-actions GitHub Actions
Copy link

github-actions bot commented Nov 3, 2023

🤖 Vercel preview here: https://docs-i5nvhxbnr-goteleport.vercel.app/docs/ver/preview

@github-actions GitHub Actions
Copy link

github-actions bot commented Nov 3, 2023

🤖 Vercel preview here: https://docs-76tjusnok-goteleport.vercel.app/docs/ver/preview

@github-actions GitHub Actions
Copy link

github-actions bot commented Nov 6, 2023

🤖 Vercel preview here: https://docs-5bwebroa4-goteleport.vercel.app/docs/ver/preview

@github-actions GitHub Actions
Copy link

github-actions bot commented Nov 6, 2023

🤖 Vercel preview here: https://docs-4euiyivz1-goteleport.vercel.app/docs/ver/preview

@strideynet strideynet added this pull request to the merge queue Nov 6, 2023
Merged via the queue into master with commit 9157b85 Nov 6, 2023
39 checks passed
@strideynet strideynet deleted the strideynet/fix-tbot-kube-port branch November 6, 2023 20:52
@public-teleport-github-review-bot
Copy link

@strideynet See the table below for backport results.

Branch Result
branch/v14 Create PR

@strideynet strideynet mentioned this pull request Nov 7, 2023
Merged
logand22 pushed a commit that referenced this pull request Nov 10, 2023
@strideynet @logand22
Fix Machine ID selection of Kubernetes Access address/port (#34202)
768ef9a 
* Improve selection of Kubernetes port and SNI

* Add additional test just for connection selektion

* Remove docs related to this bug

* Open Kube listener in kube test

* Use `client.GetKubeTLSServerName`

* Remove extranoues space
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tigrato tigrato tigrato approved these changes

@zmb3 zmb3 zmb3 approved these changes

@ptgott ptgott ptgott approved these changes

Assignees
No one assigned
Labels
backport/branch/v14 documentation machine-id size/sm
Projects
None yet
Milestone
No milestone
4 participants
@strideynet @tigrato @zmb3 @ptgott