Skip to content

Fix wrong sandbox image path in containerd/config.toml v3 #12665

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
Merged
merged 1 commit into from
Aug 5, 2025
Merged

Fix wrong sandbox image path in containerd/config.toml v3 #12665

merged 1 commit into from
Aug 5, 2025

Conversation

MrBatschner
Copy link
Contributor

@MrBatschner MrBatschner commented Aug 4, 2025 •
edited by rfranzke
Loading

How to categorize this PR?

/area os
/kind bug

What this PR does / why we need it:

With PR #11623 the paths for various configuration items in containerd/config.toml are retrieved from a look-up table depending on the version of the containerd/config.toml file. Unfortunately, said PR contained an error for the sandbox image configuration which results in containerd 2.x always using the default registry.k8s.io/pause:3.10. This will not work in environments that cannot access the registry.k8s.io container registry and nodes with containerd 2.x in such environments will not be able to join the cluster.

With containerd 2.x (and thus containerd/config.toml v3), the sandbox image is configured at [plugins.'io.containerd.cri.v1.images'.pinned_images] according to https://github.com/containerd/containerd/blob/e2404157c476efcf0ecf6cd49aa3c7ed8a26c858/docs/cri/config.md?plain=1#L189-L190.

This PR fixes the wrong path so that the sandbox image location can be properly configured to a custom image with containerd 2.x.

Which issue(s) this PR fixes:
Fixes #

Release note:

A bug in `gardener-node-agent` that prevented the location for the sandbox image to be configurable to a custom value on worker nodes with containerd 2.x was fixed.

@gardener-prow gardener-prow bot added area/os Operator system related kind/bug Bug labels Aug 4, 2025
@gardener-prow gardener-prow bot requested review from marc1404 and vitanovs August 4, 2025 13:52
@gardener-prow gardener-prow bot added cla: yes Indicates the PR's author has signed the cla-assistant.io CLA. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Aug 4, 2025
@MrBatschner MrBatschner changed the title Fix wrong sandbox_image path in containerd.toml v3 Fix wrong sandbox image path in containerd/config.toml v3 Aug 4, 2025
LucaBernstein
LucaBernstein reviewed Aug 4, 2025
View reviewed changes
Copy link
Member

@LucaBernstein LucaBernstein left a comment

Choose a reason for hiding this comment

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

Thank you!
/lgtm
/approve

@gardener-prow gardener-prow bot added the lgtm Indicates that a PR is ready to be merged. label Aug 4, 2025
@gardener-prow Gardener Prow
Copy link
Contributor

gardener-prow bot commented Aug 4, 2025

LGTM label has been added.

Git tree hash: ed717daeed9b37fbd03d882727a14965f9d0582f

@gardener-prow Gardener Prow
Copy link
Contributor

gardener-prow bot commented Aug 4, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: LucaBernstein

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@gardener-prow gardener-prow bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 4, 2025
@MrBatschner
Copy link
Contributor Author

/retest

@vpnachev
Copy link
Member

vpnachev commented Aug 5, 2025

/cherry-pick release-v1.123

@gardener-ci-robot
Copy link
Contributor

@vpnachev: once the present PR merges, I will cherry-pick it on top of release-v1.123 in a new PR and assign it to you.

In response to this:

/cherry-pick release-v1.123

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@vpnachev
Copy link
Member

vpnachev commented Aug 5, 2025

/cherry-pick release-v1.122

@gardener-ci-robot
Copy link
Contributor

@vpnachev: once the present PR merges, I will cherry-pick it on top of release-v1.122 in a new PR and assign it to you.

In response to this:

/cherry-pick release-v1.122

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@vpnachev
Copy link
Member

vpnachev commented Aug 5, 2025

/cherry-pick release-v1.124

@gardener-ci-robot
Copy link
Contributor

@vpnachev: once the present PR merges, I will cherry-pick it on top of release-v1.124 in a new PR and assign it to you.

In response to this:

/cherry-pick release-v1.124

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@vpnachev
Copy link
Member

vpnachev commented Aug 5, 2025

/lgtm

@gardener-prow gardener-prow bot merged commit 1d609e0 into gardener:master Aug 5, 2025
19 checks passed
@gardener-ci-robot
Copy link
Contributor

@vpnachev: new pull request created: #12670

In response to this:

/cherry-pick release-v1.123

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@gardener-ci-robot gardener-ci-robot mentioned this pull request Aug 5, 2025
Merged
@gardener-ci-robot
Copy link
Contributor

@vpnachev: new pull request created: #12671

In response to this:

/cherry-pick release-v1.122

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@gardener-ci-robot gardener-ci-robot mentioned this pull request Aug 5, 2025
Merged
@gardener-ci-robot
Copy link
Contributor

@vpnachev: new pull request created: #12672

In response to this:

/cherry-pick release-v1.124

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@gardener-ci-robot gardener-ci-robot mentioned this pull request Aug 5, 2025
Merged
Duciwuci pushed a commit to stackitcloud/gardener that referenced this pull request Sep 1, 2025
@MrBatschner @Duciwuci
Fix wrong sandbox_image path in containerd.toml v3 (gardener#12665)
3034952
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@LucaBernstein LucaBernstein LucaBernstein left review comments

@marc1404 marc1404 Awaiting requested review from marc1404

@vitanovs vitanovs Awaiting requested review from vitanovs

Assignees

@vpnachev vpnachev

@LucaBernstein LucaBernstein

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/os Operator system related cla: yes Indicates the PR's author has signed the cla-assistant.io CLA. kind/bug Bug lgtm Indicates that a PR is ready to be merged. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@MrBatschner @vpnachev @gardener-ci-robot @LucaBernstein