Skip to content

Migrate to IMDS v2 #145

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

Merged
SaxyPandaBear merged 1 commit into from
Jul 25, 2023
Merged

Migrate to IMDS v2 #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions ...oyment-mode/daemonset/container-insights-monitoring/fluent-bit/fluent-bit-compatible.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,11 @@ data:
storage.sync normal
storage.checksum off
storage.backlog.mem_limit 5M

@INCLUDE application-log.conf
@INCLUDE dataplane-log.conf
@INCLUDE host-log.conf

application-log.conf: |
[INPUT]
Name tail
Expand Down Expand Up @@ -125,15 +125,15 @@ data:
Name modify
Match application.*
Rename Nested.docker_id Docker.container_id

[FILTER]
Name nest
Match application.*
Operation nest
Wildcard Nested.*
Nested_under kubernetes
Remove_prefix Nested.

[FILTER]
Name nest
Match application.*
Expand Down Expand Up @@ -173,7 +173,7 @@ data:
[FILTER]
Name aws
Match dataplane.*
imds_version v1
imds_version v2

[OUTPUT]
Name cloudwatch
Expand All @@ -183,7 +183,7 @@ data:
log_stream_name $(tag[2]).$(tag[3])-$(hostname)
auto_create_group true
extra_user_agent container-insight

host-log.conf: |
[INPUT]
Name tail
Expand Down Expand Up @@ -221,7 +221,7 @@ data:
[FILTER]
Name aws
Match host.*
imds_version v1
imds_version v2

[OUTPUT]
Name cloudwatch
Expand Down
8 changes: 4 additions & 4 deletions ...plates/deployment-mode/daemonset/container-insights-monitoring/fluent-bit/fluent-bit.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,11 @@ data:
storage.sync normal
storage.checksum off
storage.backlog.mem_limit 5M

@INCLUDE application-log.conf
@INCLUDE dataplane-log.conf
@INCLUDE host-log.conf

application-log.conf: |
[INPUT]
Name tail
Expand Down Expand Up @@ -158,7 +158,7 @@ data:
[FILTER]
Name aws
Match dataplane.*
imds_version v1
imds_version v2

[OUTPUT]
Name cloudwatch_logs
Expand Down Expand Up @@ -206,7 +206,7 @@ data:
[FILTER]
Name aws
Match host.*
imds_version v1
imds_version v2
Copy link
Contributor

@PettitWesley PettitWesley Jul 25, 2023

Choose a reason for hiding this comment

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

To access IMDSv2 with the default hop limit of 1, does the daemonset of FLB need to run in the host network?

Copy link
Contributor Author

@otterley otterley Jul 25, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

If the hop limit is set to 1, then, yes, the pod would have to use host networking. The default on modern EKS AMIs is set to 2, though. And IMDSv1 wouldn't work with such a hop limit if run as a pod with container networking.

Copy link
Contributor

@SaxyPandaBear SaxyPandaBear Jul 25, 2023

Choose a reason for hiding this comment

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

Yeah from what I've seen, managed EKS nodes are configured with hop limit of 2 by default. This doesn't account for self-managed nodes unfortunately.


[OUTPUT]
Name cloudwatch_logs
Expand Down
8 changes: 4 additions & 4 deletions ...ode/daemonset/container-insights-monitoring/quickstart/cwagent-fluent-bit-quickstart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,11 +254,11 @@ data:
storage.sync normal
storage.checksum off
storage.backlog.mem_limit 5M

@INCLUDE application-log.conf
@INCLUDE dataplane-log.conf
@INCLUDE host-log.conf

application-log.conf: |
[INPUT]
Name tail
Expand Down Expand Up @@ -355,7 +355,7 @@ data:
[FILTER]
Name aws
Match dataplane.*
imds_version v1
imds_version v2

[OUTPUT]
Name cloudwatch_logs
Expand Down Expand Up @@ -403,7 +403,7 @@ data:
[FILTER]
Name aws
Match host.*
imds_version v1
imds_version v2

[OUTPUT]
Name cloudwatch_logs
Expand Down