Skip to content

app-containers/containerd: use default config - #4309

Closed
tormath1 wants to merge 2 commits into
mainfrom
tormath1/containerd
Closed

tormath1 wants to merge 2 commits into
mainfrom
tormath1/containerd

Conversation

@tormath1

@tormath1 tormath1 commented Oct 8, 2026 •

Copy link
Copy Markdown
Contributor

This enable the configuration override from '/etc' drop-ins.

Testing done

variant: flatcar
version: 1.0.0
storage:
  files:
    - path: /etc/containerd/conf.d/oom.toml
      contents:
        inline: |
          oom_score = -12

Gives:

core@localhost ~ $ cat /proc/$(pidof containerd)/oom_score_adj
-12

[Describe the testing you have done before submitting this PR. Please include both the commands you issued as well as the output you got.]

Copilot AI balanced review requested due to automatic review settings October 8, 2026 08:29
@tormath1 tormath1 self-assigned this Oct 8, 2026
@tormath1 tormath1 added the main label Oct 8, 2026

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

🟡 Changes recommended

The Flatcar drop-in is stripped from sysext images, and the configuration hard-codes amd64 on arm64 builds.

2 open findings
What changed in this PR

Enables containerd configuration through /etc drop-ins while adopting the v3 default configuration.

Changes:

  • Adds the generated containerd v3 configuration.
  • Moves Flatcar-specific settings into a drop-in.
File Description
config.toml Adds defaults and drop-in imports.
containerd Installs Flatcar-specific overrides.

🧠 Review effort: Balanced


Give feedback about Copilot approvals in this survey to enter a drawing for a $150 gift card.

Comment on lines +2 to +3
insinto /etc/containerd/conf.d/
newins - 50-flatcar-containerd.toml <<'EOF'
This enable the configuration override from '/etc' drop-ins. Regarding
the version mismatch (2 vs 3):
> Imported files are also versioned, and the version can't be higher than the main config.

So we should be good.

Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
@tormath1
tormath1 force-pushed the tormath1/containerd branch from 3b665d1 to b481f58 Compare October 8, 2026 08:42
Copilot AI balanced review requested due to automatic review settings October 8, 2026 08:42

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

🟡 Changes recommended

The Flatcar overrides are discarded during migration, and the generated configuration hard-codes the amd64 platform.

3 open findings

🧠 Review effort: Balanced


Give feedback about Copilot approvals in this survey to enter a drawing for a $150 gift card.

Copilot AI balanced review requested due to automatic review settings October 8, 2026 13:34

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

🔵 Needs a closer look

The configuration incorrectly pins arm64 builds to amd64 and lacks the required user-facing changelog entry.

2 open findings
1 resolved since last review
Previously missed (1)

In code that hasn't changed since last review

Low severity Add changelog entry for new containerd configuration interface

sdk_container/​src/​third_party/​coreos-overlay/​coreos/​sysext/​containerd/​usr/​share/​containerd/​config.toml:5

This enables a user-facing containerd configuration interface, but the PR has no changelog entry. Add one under changelog/changes; the comparable default-configuration change is documented in sdk_container/src/third_party/coreos-overlay/changelog/changes/2022-03-08-containerd-selinux.md:1.

🧠 Review effort: Balanced


Give feedback about Copilot approvals in this survey to enter a drawing for a $150 gift card.

* Migrate the config to version 3
* Drop the 'io.containerd.runtime.v1.linux' as it's not available in
  containerd 2.x
Copilot AI balanced review requested due to automatic review settings October 8, 2026 13:41
@tormath1
tormath1 force-pushed the tormath1/containerd branch from 3b9f385 to d73c73d Compare October 8, 2026 13:41

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

🟡 Changes recommended

The generated configuration pins upstream defaults, and the user-facing change lacks a changelog entry.

3 open findings
1 resolved since last review

🧠 Review effort: Balanced


Give feedback about Copilot approvals in this survey to enter a drawing for a $150 gift card.

Comment on lines +7 to +12
root = '/var/lib/containerd'
state = '/run/containerd'
temp = ''
disabled_plugins = []
required_plugins = []
oom_score = 0

version = 3

imports = ['/usr/share/containerd/flatcar-config.toml', '/etc/containerd/conf.d/*.toml']
@tormath1

tormath1 commented Oct 9, 2026

Copy link
Copy Markdown
Contributor Author

Closing in favor of: #4150

@tormath1 tormath1 closed this Oct 9, 2026
@tormath1
tormath1 deleted the tormath1/containerd branch October 9, 2026 07:35

This branch is waiting to be deployed

1 waiting deployment
development — d73c73dd Waiting Oct 8, 2026 by tormath1 via Wait for approval #5983
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants