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

Add join-method flag to teleport node configure #13097

Merged
merged 3 commits into from
Jun 3, 2022
Merged

Add join-method flag to teleport node configure #13097

merged 3 commits into from
Jun 3, 2022

Conversation

lxea
Copy link
Contributor

@lxea lxea commented Jun 2, 2022

The join method flag will be used in #12410

This also documents the join_method configuration option int the
reference config.

@lxea lxea force-pushed the lxea/node-config-flags branch 2 times, most recently from 56e12c2 to 058fb7d Compare June 2, 2022 13:03
zmb3
zmb3 reviewed Jun 2, 2022
View reviewed changes
lib/config/fileconf.go Outdated Show resolved Hide resolved
zmb3
zmb3 reviewed Jun 2, 2022
View reviewed changes
lib/config/fileconf.go Outdated Show resolved Hide resolved
zmb3
zmb3 reviewed Jun 2, 2022
View reviewed changes
lib/config/fileconf.go Outdated Show resolved Hide resolved
@lxea lxea force-pushed the lxea/node-config-flags branch from 058fb7d to e4a3c2b Compare June 2, 2022 15:25
hatched
hatched approved these changes Jun 2, 2022
View reviewed changes
Copy link
Contributor

@hatched hatched left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for this!

lib/config/fileconf.go Outdated Show resolved Hide resolved
tool/teleport/common/teleport.go Outdated Show resolved Hide resolved
nklaassen
nklaassen reviewed Jun 2, 2022
View reviewed changes
docs/pages/setup/reference/config.mdx Outdated Show resolved Hide resolved
docs/pages/setup/reference/config.mdx Outdated Show resolved Hide resolved
tool/teleport/common/teleport.go Outdated Show resolved Hide resolved
@hatched hatched mentioned this pull request Jun 2, 2022
Merged
zmb3
zmb3 reviewed Jun 2, 2022
View reviewed changes
lib/config/fileconf.go Outdated Show resolved Hide resolved
@lxea lxea force-pushed the lxea/node-config-flags branch 5 times, most recently from 08ad429 to 5dff3a9 Compare June 3, 2022 14:02
ptgott
ptgott reviewed Jun 3, 2022
View reviewed changes
docs/pages/setup/reference/config.mdx Outdated Show resolved Hide resolved
docs/pages/setup/reference/config.mdx Outdated Show resolved Hide resolved
docs/pages/setup/reference/config.mdx Outdated Show resolved Hide resolved
docs/pages/setup/reference/config.mdx Outdated Show resolved Hide resolved
docs/pages/setup/reference/config.mdx Show resolved Hide resolved
@lxea lxea force-pushed the lxea/node-config-flags branch 2 times, most recently from ef080f3 to d4c3100 Compare June 3, 2022 14:45
@lxea lxea enabled auto-merge (rebase) June 3, 2022 14:46
@lxea lxea force-pushed the lxea/node-config-flags branch from d4c3100 to 7dcbdb3 Compare June 3, 2022 14:48
@lxea lxea disabled auto-merge June 3, 2022 14:49
@lxea lxea enabled auto-merge (squash) June 3, 2022 14:49
Alex McGrath added 2 commits June 3, 2022 15:29
Add join-method flag to teleport node configure
0a3f6e3 
This will be used by EC2 auto discovery for generating configs after
installation
Document join_params in reference/config.mdx
da2d594
@lxea lxea force-pushed the lxea/node-config-flags branch from 7dcbdb3 to da2d594 Compare June 3, 2022 15:29
@lxea lxea requested a review from zmb3 June 3, 2022 15:54
@lxea lxea merged commit 1b81a04 into master Jun 3, 2022
@lxea lxea deleted the lxea/node-config-flags branch June 7, 2022 10:17
@strideynet strideynet mentioned this pull request Jun 16, 2022
Closed
@strideynet
Copy link
Contributor

This PR has introduced a regression to the teleport configure command when using the --token flag. I think we must have missed that the underlying configuration loading stuff in Teleport does not currently support providing the token in teleport.join_params.token_name.

Further discussion in #13558

@lxea
Copy link
Contributor Author

lxea commented Jun 16, 2022 •
edited
Loading

Ah, configuration.go/applyTokenConfig just needs to add types.JoinMethodToken to its case clause and teleport configure should probably default to setting join_params.method to token or add a --join-method option to it aswell

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

@hatched hatched hatched approved these changes

@zmb3 zmb3 zmb3 approved these changes

@nklaassen nklaassen nklaassen approved these changes

@ptgott ptgott ptgott approved these changes

@ibeckermayer ibeckermayer Awaiting requested review from ibeckermayer

@r0mant r0mant Awaiting requested review from r0mant

@xinding33 xinding33 Awaiting requested review from xinding33

Assignees
No one assigned
Labels
documentation
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@lxea @strideynet @hatched @zmb3 @nklaassen @ptgott