Skip to content

[WIP] Require v3 configuration on containerd imports#7376

Draft
juanluisvaladas wants to merge 20 commits intok0sproject:mainfrom
juanluisvaladas:containerd-require-confv3
Draft

[WIP] Require v3 configuration on containerd imports#7376
juanluisvaladas wants to merge 20 commits intok0sproject:mainfrom
juanluisvaladas:containerd-require-confv3

Conversation

@juanluisvaladas
Copy link
Copy Markdown
Contributor

@juanluisvaladas juanluisvaladas commented Mar 31, 2026 •
edited
Loading

Description

Blocked on #7350.

TODO: writte appropriate description and rebase

Fixes #7377

Type of change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Documentation update

How Has This Been Tested?

  • Manual test
  • Auto test added

Checklist

  • My code follows the style guidelines of this project
  • My commit messages are signed-off
  • I have performed a self-review of my code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes
  • Any dependent changes have been merged and published in downstream modules
  • I have checked my code and corrected any misspellings

juanluisvaladas and others added 20 commits March 31, 2026 11:08
@juanluisvaladas
[inttest] containerd v1 to v2 live migration
c473d65 
Implement a test that verifies that the transition between containerd v1
and v2 can be done without restarting pods.

Fixes k0sproject#7348

Signed-off-by: Juan-Luis de Sousa-Valadas Castaño <juanluisvaladas@users.noreply.github.com>
@k0s-bot @juanluisvaladas
Bump k0sproject/k0sctl to v0.29.0
d36a96d 
Signed-off-by: k0s-bot <110385897+k0s-bot@users.noreply.github.com>
@dependabot @juanluisvaladas
Bump requests from 2.32.5 to 2.33.0 in /docs
76cf2b7 
Bumps [requests](https://github.com/psf/requests) from 2.32.5 to 2.33.0.
- [Release notes](https://github.com/psf/requests/releases)
- [Changelog](https://github.com/psf/requests/blob/main/HISTORY.md)
- [Commits](psf/requests@v2.32.5...v2.33.0)

---
updated-dependencies:
- dependency-name: requests
  dependency-version: 2.33.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot @juanluisvaladas
Bump DavidAnson/markdownlint-cli2-action from 22.0.0 to 23.0.0
b12be89 
Bumps [DavidAnson/markdownlint-cli2-action](https://github.com/davidanson/markdownlint-cli2-action) from 22.0.0 to 23.0.0.
- [Release notes](https://github.com/davidanson/markdownlint-cli2-action/releases)
- [Commits](DavidAnson/markdownlint-cli2-action@v22.0.0...v23.0.0)

---
updated-dependencies:
- dependency-name: DavidAnson/markdownlint-cli2-action
  dependency-version: 23.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
@k0s-bot @juanluisvaladas
Bump docker.io/library/traefik Docker tag to v3.6.12
67e5e74 
Signed-off-by: k0s-bot <110385897+k0s-bot@users.noreply.github.com>
@k0s-bot @juanluisvaladas
Bump moby/buildkit to v0.28.1
e170b06 
Signed-off-by: k0s-bot <110385897+k0s-bot@users.noreply.github.com>
@dependabot @juanluisvaladas
Bump korthout/backport-action from 4.2.0 to 4.3.0
149902c 
Bumps [korthout/backport-action](https://github.com/korthout/backport-action) from 4.2.0 to 4.3.0.
- [Release notes](https://github.com/korthout/backport-action/releases)
- [Commits](korthout/backport-action@v4.2.0...v4.3.0)

---
updated-dependencies:
- dependency-name: korthout/backport-action
  dependency-version: 4.3.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
@olofvndrhr @juanluisvaladas
Update the traefik ingress controller example
f07f083 
Signed-off-by: Ivan Schaller <ivan@schaller.sh>
@olofvndrhr @juanluisvaladas
Update metallb docs to use the correct namespace and fix formatting
32f8c96 
Signed-off-by: Ivan Schaller <ivan@schaller.sh>
@olofvndrhr @juanluisvaladas
Fix indentation for markdownlint
27a5d5f 
Signed-off-by: Ivan Schaller <ivan@schaller.sh>
@juanluisvaladas
Remove minio from storage.md docs
e4d6b3d 
Signed-off-by: martim <martim@mouratech.net>
@k0s-bot @juanluisvaladas
Bump docker.io/library/nginx Docker tag to v1.29.7
5350ae0 
Signed-off-by: k0s-bot <110385897+k0s-bot@users.noreply.github.com>
@juanluisvaladas
[renovate] Don't bump go in release-1.34
695d148 
We have to bump go to v1.25 in release-1.33 due to etcd v3.5.28.
Therefore we are also bumping it on release-1.34 and hence we don't need
to track the go version because it's the same as in release-1.35.

Signed-off-by: Juan-Luis de Sousa-Valadas Castaño <juanluisvaladas@users.noreply.github.com>
@dependabot @juanluisvaladas
Bump pymdown-extensions from 10.21 to 10.21.2 in /docs
67aa552 
Bumps [pymdown-extensions](https://github.com/facelessuser/pymdown-extensions) from 10.21 to 10.21.2.
- [Release notes](https://github.com/facelessuser/pymdown-extensions/releases)
- [Commits](facelessuser/pymdown-extensions@10.21...10.21.2)

---
updated-dependencies:
- dependency-name: pymdown-extensions
  dependency-version: 10.21.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot @juanluisvaladas
Bump renovatebot/github-action from 46.1.6 to 46.1.7
fa08f7f 
Bumps [renovatebot/github-action](https://github.com/renovatebot/github-action) from 46.1.6 to 46.1.7.
- [Release notes](https://github.com/renovatebot/github-action/releases)
- [Changelog](https://github.com/renovatebot/github-action/blob/main/CHANGELOG.md)
- [Commits](renovatebot/github-action@v46.1.6...v46.1.7)

---
updated-dependencies:
- dependency-name: renovatebot/github-action
  dependency-version: 46.1.7
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot @juanluisvaladas
Bump pygments from 2.19.2 to 2.20.0 in /docs
765a1e2 
Bumps [pygments](https://github.com/pygments/pygments) from 2.19.2 to 2.20.0.
- [Release notes](https://github.com/pygments/pygments/releases)
- [Changelog](https://github.com/pygments/pygments/blob/master/CHANGES)
- [Commits](pygments/pygments@2.19.2...2.20.0)

---
updated-dependencies:
- dependency-name: pygments
  dependency-version: 2.20.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot @juanluisvaladas
Bump modernc.org/sqlite from 1.47.0 to 1.48.0
f151685 
Bumps [modernc.org/sqlite](https://gitlab.com/cznic/sqlite) from 1.47.0 to 1.48.0.
- [Changelog](https://gitlab.com/cznic/sqlite/blob/master/CHANGELOG.md)
- [Commits](https://gitlab.com/cznic/sqlite/compare/v1.47.0...v1.48.0)

---
updated-dependencies:
- dependency-name: modernc.org/sqlite
  dependency-version: 1.48.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot @juanluisvaladas
Bump regex from 2026.2.28 to 2026.3.32 in /docs
898b872 
Bumps [regex](https://github.com/mrabarnett/mrab-regex) from 2026.2.28 to 2026.3.32.
- [Changelog](https://github.com/mrabarnett/mrab-regex/blob/hg/changelog.txt)
- [Commits](mrabarnett/mrab-regex@2026.2.28...2026.3.32)

---
updated-dependencies:
- dependency-name: regex
  dependency-version: 2026.3.32
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
@juanluisvaladas
Simplify checking if containerd config k0s managed
8baec2a 
If it's k0s managed k0s overrides the configuration file, therefore we
don't need to verify if it has a pre 1.27 or pre 1.30
support upgrading from 1.27 to 1.36 we can just remove all the checks
for pre 1.27 configuration.
@juanluisvaladas
Require containerd imports to be version 3
b343ace 
Signed-off-by: Juan-Luis de Sousa-Valadas Castaño <juanluisvaladas@users.noreply.github.com>
@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Apr 1, 2026

This pull request has merge conflicts that need to be resolved.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

merge-conflict

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Handle containerd config with version = 2

3 participants

@juanluisvaladas @k0s-bot @olofvndrhr