From 284716350cac0eadcb77547e1bcc17a76ef49b4e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Sep 2025 23:08:24 +0000 Subject: [PATCH 1/4] build(deps): bump github/codeql-action from 3.30.0 to 3.30.1 Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.30.0 to 3.30.1. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/2d92b76c45b91eb80fc44c74ce3fce0ee94e8f9d...f1f6e5f6af878fb37288ce1c627459e94dbf7d01) --- updated-dependencies: - dependency-name: github/codeql-action dependency-version: 3.30.1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/codeql.yml | 4 ++-- .github/workflows/scorecards.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 7be4d7168f0b..90858231e537 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -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 @@ -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 diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml index 82b391e77818..3518b7eb73da 100644 --- a/.github/workflows/scorecards.yml +++ b/.github/workflows/scorecards.yml @@ -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 From 52c310c98ca06f365793dab8c4bd95a7101ef785 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Sep 2025 23:08:34 +0000 Subject: [PATCH 2/4] build(deps): bump actions/github-script from 7.0.1 to 8.0.0 Bumps [actions/github-script](https://github.com/actions/github-script) from 7.0.1 to 8.0.0. - [Release notes](https://github.com/actions/github-script/releases) - [Commits](https://github.com/actions/github-script/compare/60a0d83039c74a4aee543508d2ffcb1c3799cdea...ed597411d8f924073f98dfc5c65a23a2325f34cd) --- updated-dependencies: - dependency-name: actions/github-script dependency-version: 8.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/windows-hyperv-periodic.yml | 2 +- .github/workflows/windows-periodic.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/windows-hyperv-periodic.yml b/.github/workflows/windows-hyperv-periodic.yml index a1a6af01b889..5926bda2c85d 100644 --- a/.github/workflows/windows-hyperv-periodic.yml +++ b/.github/workflows/windows-hyperv-periodic.yml @@ -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 = { diff --git a/.github/workflows/windows-periodic.yml b/.github/workflows/windows-periodic.yml index b047de8be496..7c3f2605c139 100644 --- a/.github/workflows/windows-periodic.yml +++ b/.github/workflows/windows-periodic.yml @@ -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 = { From cfe20b58887cffce5892855d0fc8915ea725d463 Mon Sep 17 00:00:00 2001 From: Akhil Mohan Date: Thu, 11 Sep 2025 11:56:54 +0530 Subject: [PATCH 3/4] add k8s 1.34 support matrix - add k8s 1.34 into support matrix - remove k8s 1.30 as its EOL in upstream Signed-off-by: Akhil Mohan --- RELEASES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RELEASES.md b/RELEASES.md index 910bf507c079..9ea2acf6155e 100644 --- a/RELEASES.md +++ b/RELEASES.md @@ -147,10 +147,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 From 84aa20676c2297b71db27e8506f948ccd8a4acd9 Mon Sep 17 00:00:00 2001 From: Chris Henzie Date: Fri, 12 Sep 2025 09:57:48 -0700 Subject: [PATCH 4/4] docs: Update 1.7 LTS support timeline Extend the LTS support window for the 1.7 release branch to September 2026. The footnote asterisk is escaped to ensure correct rendering on the hugo site. This change reflects the decision made during the community meeting, where @chrishenzie and @samuelkarp volunteered to provide extended support beyond the standard two-year LTS period. The existing support from @containerd/committers remains in place until March 2026. Signed-off-by: Chris Henzie --- RELEASES.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/RELEASES.md b/RELEASES.md index 910bf507c079..ac8b20fd29ff 100644 --- a/RELEASES.md +++ b/RELEASES.md @@ -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