Skip to content

[pull] main from containerd:main #104

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
pull merged 8 commits into from
Sep 16, 2025
Merged

[pull] main from containerd:main #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2847163
build(deps): bump github/codeql-action from 3.30.0 to 3.30.1
dependabot[bot] Sep 8, 2025
52c310c
build(deps): bump actions/github-script from 7.0.1 to 8.0.0
dependabot[bot] Sep 8, 2025
cfe20b5
add k8s 1.34 support matrix
akhilerm Sep 11, 2025
84aa206
docs: Update 1.7 LTS support timeline
chrishenzie Sep 12, 2025
8011ee3
Merge pull request #12294 from akhilerm/update-release-1.34
estesp Sep 15, 2025
2ee4993
Merge pull request #12284 from containerd/dependabot/github_actions/g…
estesp Sep 15, 2025
b08bb08
Merge pull request #12297 from chrishenzie/extend-lts
mxpv Sep 15, 2025
1e65216
Merge pull request #12286 from containerd/dependabot/github_actions/a…
mxpv Sep 15, 2025
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
4 changes: 2 additions & 2 deletions .github/workflows/codeql.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@2d92b76c45b91eb80fc44c74ce3fce0ee94e8f9d # v3.30.0
uses: github/codeql-action/init@f1f6e5f6af878fb37288ce1c627459e94dbf7d01 # v3.30.1
# Override language selection by uncommenting this and choosing your languages
# with:
# languages: go, javascript, csharp, python, cpp, java
Expand All @@ -46,4 +46,4 @@ jobs:
make

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@2d92b76c45b91eb80fc44c74ce3fce0ee94e8f9d # v3.30.0
uses: github/codeql-action/analyze@f1f6e5f6af878fb37288ce1c627459e94dbf7d01 # v3.30.1
2 changes: 1 addition & 1 deletion .github/workflows/scorecards.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,6 @@ jobs:

# Upload the results to GitHub's code scanning dashboard.
- name: "Upload to code-scanning"
uses: github/codeql-action/upload-sarif@2d92b76c45b91eb80fc44c74ce3fce0ee94e8f9d # tag=v3.30.0
uses: github/codeql-action/upload-sarif@f1f6e5f6af878fb37288ce1c627459e94dbf7d01 # tag=v3.30.1
with:
sarif_file: results.sarif
2 changes: 1 addition & 1 deletion .github/workflows/windows-hyperv-periodic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ jobs:
parent: false

- name: Check all CI stages succeeded
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
with:
script: |
const stepResults = {
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/windows-periodic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ jobs:
parent: false

- name: Check all CI stages succeeded
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
with:
script: |
const stepResults = {
Expand Down
6 changes: 4 additions & 2 deletions RELEASES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,12 +128,14 @@ to all committers.
| [1.4](https://github.com/containerd/containerd/releases/tag/v1.4.13) | End of Life | August 17, 2020 | March 3, 2022 | |
| [1.5](https://github.com/containerd/containerd/releases/tag/v1.5.18) | End of Life | May 3, 2021 | February 28, 2023 | |
| [1.6](https://github.com/containerd/containerd/releases/tag/v1.6.0) | Extended | February 15, 2022 | August 23, 2025 | @containerd/committers |
| [1.7](https://github.com/containerd/containerd/releases/tag/v1.7.0) | LTS | March 10, 2023 | March 10, 2026 | @containerd/committers |
| [1.7](https://github.com/containerd/containerd/releases/tag/v1.7.0) | LTS | March 10, 2023 | September 2026* | @containerd/committers |
| [2.0](https://github.com/containerd/containerd/releases/tag/v2.0.0) | Active | November 5, 2024 | November 7, 2025 | @containerd/committers |
| [2.1](https://github.com/containerd/containerd/releases/tag/v2.1.0) | Active | May 7, 2025 | May 5, 2026 (_tentative_) | @containerd/committers |
| [2.2](https://github.com/containerd/containerd/milestone/49) | _Future_ | November 5, 2025 (_tentative_) | November 6, 2026 (_tentative_) | _TBD_ |
| [2.3](https://github.com/containerd/containerd/milestone/50) | _Future_ | May 6, 2026 (_tentative_) | _TBD_ | _TBD_ |

\* Support for the 1.7 release branch is provided by @containerd/committers until March 10, 2026. Extended support through September 2026 is provided by @chrishenzie and @samuelkarp.

### Kubernetes Support

The Kubernetes version matrix represents the versions of containerd which are
Expand All @@ -147,10 +149,10 @@ of containerd for every supported version of Kubernetes.

| Kubernetes Version | containerd Version | CRI Version |
|--------------------|----------------------------------|-----------------|
| 1.30 | 2.1.0+, 2.0.0+, 1.7.13+, 1.6.28+ | v1 |
| 1.31 | 2.1.0+, 2.0.0+, 1.7.20+, 1.6.34+ | v1 |
| 1.32 | 2.1.0+, 2.0.1+, 1.7.24+, 1.6.36+ | v1 |
| 1.33 | 2.1.0+, 2.0.4+, 1.7.24+, 1.6.36+ | v1 |
| 1.34 | 2.1.3+, 2.0.6+, 1.7.28+, 1.6.39+ | v1 |

Deprecated containerd and kubernetes versions

Expand Down
Loading