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.

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

[1.14.x] Cherry-pick #3137, #3138, #3139 #3140

Merged
merged 4 commits into from
May 24, 2023

Conversation

etungsten
Copy link
Contributor

Issue number:
N/A

Description of changes:
Cherry-picks #3137, #3138, #3139

Testing done:
See referenced PRs for testing info.

Terms of contribution:

By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.

markusboehme and others added 4 commits May 23, 2023 17:02
Increase the kernel's default value for the net.unix.max_dgram_qlen sysctl
to 512. This is a change to the kernel rather than a plain sysctl setting
since systemd-sysctl only applies settings to the host, while the changed
default value in the kernel also applies to every new network namespace.

Signed-off-by: Markus Boehme <markubo@amazon.com>
Increase the kernel's default value for the net.unix.max_dgram_qlen sysctl
to 512. This is a change to the kernel rather than a plain sysctl setting
since systemd-sysctl only applies settings to the host, while the changed
default value in the kernel also applies to every new network namespace.

Signed-off-by: Markus Boehme <markubo@amazon.com>
In order to support pulling images from ECR repositories from
il-central-1, we need to generate our own canonical ECR image reference
since the region is not officially supported by aws-go-sdk yet.

Co-authored-by: Erikson Tung <etung@amazon.com>
Signed-off-by: John McBride <jpmmcb@amazon.com>
Copy link
Contributor

@jpmcb jpmcb left a comment

Choose a reason for hiding this comment

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

Host-ctr changes look good!!

stmcginnis

This comment was marked as duplicate.

Copy link
Contributor

@stmcginnis stmcginnis left a comment

Choose a reason for hiding this comment

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

Lgtm

Copy link
Contributor

@zmrow zmrow left a comment

Choose a reason for hiding this comment

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

🥇

@etungsten etungsten merged commit 95ed132 into bottlerocket-os:1.14.x May 24, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants