[v18] Port gitlab join method to new join service (#61203)#61590
Merged
timothyb89 merged 2 commits intobranch/v18from Nov 25, 2025
Merged
[v18] Port gitlab join method to new join service (#61203)#61590timothyb89 merged 2 commits intobranch/v18from
gitlab join method to new join service (#61203)#61590timothyb89 merged 2 commits intobranch/v18from
Conversation
* Port `gitlab` join method to new join service This ports the `gitlab` join method to the new join service. The `gitlab` package was moved to `lib/join/` with minimal changes, token verification was moved into `lib/join/gitlab` so it could be reused between both legacy and new endpoints, and a small adapter was added to provide backwards compatibility. See also: [RFD 27e](https://github.com/gravitational/teleport.e/blob/master/rfd/0027e-auth-assigned-uuids.md) * Fix imports * Add gitlab to whitelist, reorder entries alphabetically * Rename checkAndSetDefaults() to validate()
strideynet
approved these changes
Nov 21, 2025
rosstimothy
approved these changes
Nov 21, 2025
…new-join-service-gitlab
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Backport of #61203 to branch/v18
Manually re-tested with a Cloud staging tenant and a public Gitlab repo. Both legacy and new (from this branch)
tbotclients were able to join to a cluster running this branch.gitlabjoin method to new join serviceThis ports the
gitlabjoin method to the new join service.The
gitlabpackage was moved tolib/join/with minimal changes, token verification was moved intolib/join/gitlabso it could be reused between both legacy and new endpoints, and a small adapter was added to provide backwards compatibility.See also: RFD 27e
Fix imports
Add gitlab to whitelist, reorder entries alphabetically
Rename checkAndSetDefaults() to validate()