Skip to content

Support AWS EC2 IMDSv2 for installer and inventory metadata#30940

Merged
reedloden merged 1 commit intomasterfrom
reed/imdsv2-support-30364
Aug 29, 2023
Merged

Support AWS EC2 IMDSv2 for installer and inventory metadata#30940
reedloden merged 1 commit intomasterfrom
reed/imdsv2-support-30364

Conversation

@reedloden
Copy link
Copy Markdown
Contributor

While most AWS uses within Teleport fully support EC2 IMDSv2, two places were not. Correct both those paths to procure a token first before trying to access IMDS.

Fixes #30364.

@reedloden reedloden self-assigned this Aug 24, 2023
@github-actions github-actions Bot requested review from jimbishopp and r0mant August 24, 2023 08:47
@reedloden reedloden added aws Used for AWS Related Issues. backport/branch/v11 labels Aug 24, 2023
@reedloden reedloden force-pushed the reed/imdsv2-support-30364 branch from 6c7f4ff to fbc3d96 Compare August 24, 2023 09:09
Comment thread api/types/installers/installer.sh.tmpl Outdated
While most AWS uses within Teleport fully support EC2 IMDSv2, two
places were not. Correct both those paths to procure a token first
before trying to access IMDS.

Fixes #30364.
@reedloden reedloden force-pushed the reed/imdsv2-support-30364 branch from fbc3d96 to 53d66c3 Compare August 25, 2023 01:25
@reedloden reedloden requested a review from atburke August 25, 2023 01:26
Comment thread lib/inventory/metadata/metadata.go
@reedloden reedloden added this pull request to the merge queue Aug 29, 2023
Merged via the queue into master with commit 146ccac Aug 29, 2023
@reedloden reedloden deleted the reed/imdsv2-support-30364 branch August 29, 2023 09:02
@public-teleport-github-review-bot
Copy link
Copy Markdown

@reedloden See the table below for backport results.

Branch Result
branch/v11 Failed
branch/v12 Failed
branch/v13 Failed

reedloden added a commit that referenced this pull request Sep 23, 2023
Backport of #30940.

While most AWS uses within Teleport fully support EC2 IMDSv2, two
places were not. Correct both those paths to procure a token first
before trying to access IMDS.

Fixes #30364.
github-merge-queue Bot pushed a commit that referenced this pull request Sep 25, 2023
…2446)

Backport of #30940.

While most AWS uses within Teleport fully support EC2 IMDSv2, two
places were not. Correct both those paths to procure a token first
before trying to access IMDS.

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

Labels

aws Used for AWS Related Issues. size/sm

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Inventory metadata still using AWS IMDSv1

4 participants