Skip to content

[v18] Port gitlab join method to new join service (#61203)#61590

Merged
timothyb89 merged 2 commits intobranch/v18from
timothyb89/v18/new-join-service-gitlab
Nov 25, 2025
Merged

[v18] Port gitlab join method to new join service (#61203)#61590
timothyb89 merged 2 commits intobranch/v18from
timothyb89/v18/new-join-service-gitlab

Conversation

@timothyb89
Copy link
Copy Markdown
Contributor

@timothyb89 timothyb89 commented Nov 20, 2025

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) tbot clients were able to join to a cluster running this branch.


  • 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

  • Fix imports

  • Add gitlab to whitelist, reorder entries alphabetically

  • Rename checkAndSetDefaults() to validate()

* 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()
@timothyb89 timothyb89 marked this pull request as ready for review November 21, 2025 03:10
@timothyb89 timothyb89 added the no-changelog Indicates that a PR does not require a changelog entry label Nov 21, 2025
@timothyb89 timothyb89 enabled auto-merge November 25, 2025 03:44
@timothyb89 timothyb89 added this pull request to the merge queue Nov 25, 2025
Merged via the queue into branch/v18 with commit 920808c Nov 25, 2025
39 checks passed
@timothyb89 timothyb89 deleted the timothyb89/v18/new-join-service-gitlab branch November 25, 2025 04:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport no-changelog Indicates that a PR does not require a changelog entry size/md

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants