Skip to content

Update containerd to v2.1.4 #17532

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 2 commits into from
Aug 2, 2025
Merged

Update containerd to v2.1.4 #17532

merged 2 commits into from
Aug 2, 2025

Conversation

hakman
Copy link
Member

@hakman hakman commented Aug 2, 2025

Lots of deprecated features: https://github.com/containerd/containerd/blob/main/RELEASES.md#deprecated-features
and config properties: https://github.com/containerd/containerd/blob/main/RELEASES.md#deprecated-config-properties

We should also look at k/k:
https://github.com/kubernetes/kubernetes/blob/d490383fcb6c922d3788e2b7a74dc32b17ef2778/cluster/gce/gci/configure-helper.sh#L3281-L3309

% cat > "${config_path}" <<EOF
version = 2
# Kubernetes requires the cri plugin.
required_plugins = ["io.containerd.grpc.v1.cri"]
# Kubernetes doesn't use containerd restart manager.
disabled_plugins = ["io.containerd.internal.v1.restart"]
oom_score = -999

[debug]
  level = "${CONTAINERD_LOG_LEVEL:-"info"}"

[plugins."io.containerd.grpc.v1.cri"]
  stream_server_address = "127.0.0.1"
  max_container_log_line_size = ${CONTAINERD_MAX_CONTAINER_LOG_LINE:-262144}
  sandbox_image = "${CONTAINERD_INFRA_CONTAINER:-"registry.k8s.io/pause:3.10"}"
[plugins."io.containerd.grpc.v1.cri".cni]
  bin_dir = "${KUBE_HOME}/bin"
  conf_dir = "/etc/cni/net.d"
  conf_template = "${cni_template_path}"
[plugins."io.containerd.grpc.v1.cri".containerd]
  default_runtime_name = "runc"
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]
  runtime_type = "io.containerd.runc.v2"
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options]
  SystemdCgroup = ${systemdCgroup}
# enable hosts config
[plugins."io.containerd.grpc.v1.cri".registry]
  config_path = "/etc/containerd/certs.d"
EOF

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Aug 2, 2025
@k8s-ci-robot k8s-ci-robot requested a review from olemarkus August 2, 2025 10:55
@k8s-ci-robot k8s-ci-robot requested a review from zetaab August 2, 2025 10:55
@hakman hakman requested review from rifelpet and ameukam and removed request for olemarkus and zetaab August 2, 2025 10:55
@hakman hakman force-pushed the containerd-2.1.4 branch 2 times, most recently from 0b82979 to 11ff3b8 Compare August 2, 2025 15:04
@hakman hakman force-pushed the containerd-2.1.4 branch from 11ff3b8 to 1d0caed Compare August 2, 2025 15:10
@hakman
Copy link
Member Author

hakman commented Aug 2, 2025

/retest

@hakman
Copy link
Member Author

hakman commented Aug 2, 2025

/test pull-kops-e2e-azure-cni-cilium
/test pull-kops-e2e-k8s-gce-cilium
/override pull-kops-e2e-cni-amazonvpc
/override pull-kops-e2e-gce-cni-calico
/override pull-kops-e2e-cni-kuberouter

@k8s-ci-robot
Copy link
Contributor

@hakman: Overrode contexts on behalf of hakman: pull-kops-e2e-cni-amazonvpc, pull-kops-e2e-cni-kuberouter, pull-kops-e2e-gce-cni-calico

In response to this:

/test pull-kops-e2e-azure-cni-cilium
/test pull-kops-e2e-k8s-gce-cilium
/override pull-kops-e2e-cni-amazonvpc
/override pull-kops-e2e-gce-cni-calico
/override pull-kops-e2e-cni-kuberouter

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.

@hakman hakman mentioned this pull request Aug 2, 2025
Merged
rifelpet
rifelpet approved these changes Aug 2, 2025
View reviewed changes
Copy link
Member

@rifelpet rifelpet left a comment

Choose a reason for hiding this comment

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

This is probably worthy of a release note, can do in a followup though

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 2, 2025
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: rifelpet

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 2, 2025
@k8s-ci-robot k8s-ci-robot merged commit d93d488 into kubernetes:master Aug 2, 2025
38 checks passed
@hakman hakman deleted the containerd-2.1.4 branch August 3, 2025 11:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rifelpet rifelpet rifelpet approved these changes

@ameukam ameukam Awaiting requested review from ameukam

Assignees

@rifelpet rifelpet

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/nodeup cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@hakman @k8s-ci-robot @rifelpet