upstream/k3s
1
0
Fork 0
mirror of https://github.com/k3s-io/k3s.git synced 2026-04-06 09:55:01 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 5
4056 commits 44 branches 1027 tags 651 MiB
Commit graph

24 commits

Author SHA1 Message Date
Brad Davidson
268322414f Bump containerd to v2.2.2
Some checks failed
govulncheck / govulncheck (push) Has been cancelled
Details
Scorecard supply-chain security / Scorecard analysis (push) Has been cancelled
Details 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2026-03-11 18:07:30 -07:00
Brad Davidson
3acf8db8f2 Update packages to remove dep on archived github.com/pkg/errors 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2026-03-09 16:09:01 -07:00
Ada
de59b6327c Add nix-snapshotter support to the embedded containerd 
Add support for the "nix" snapshotter, which enables running container
images built with nix2container. Nix images reference store paths
directly, avoiding layer tarballs and enabling deduplication through
the nix store.

Changes:
- Register nix-snapshotter as a builtin containerd plugin
- Add NixSupported() validation (checks nix-store is in PATH)
- Configure nix-snapshotter image service proxy in V2/V3 templates
  with containerd_address for CRI image operations
- Add Transfer service unpack_config with differ=walking for
  multi-arch support
- Use containerd state dir for socket path (rootless compatible)
- Disable NRI in rootless mode to prevent bind failures

Usage: k3s server --snapshotter nix

Signed-off-by: Ada <ada@6bit.com>
Co-Authored-By: Joshua Perry <josh@6bit.com>
Signed-off-by: Ada <ada@6bit.com>
 2026-03-06 12:36:57 -08:00
Brad Davidson
316464975e lint: redundant-build-tag 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2025-12-18 11:20:07 -08:00
Brad Davidson
e47c497a3e Bump containerd to v2.1.4 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2025-08-26 10:15:38 -07:00
Brad Davidson
bed1f66880 Avoid use of github.com/pkg/errors functions that capture stack 
We are not making use of the stack traces that these functions capture, so we should avoid using them as unnecessary overhead.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2025-03-05 00:41:38 -08:00
Brad Davidson
124e46bccf Upgrade containerd to v2.0.2 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2025-02-07 12:03:48 -08:00
Sean Yen
0c9bf36fe0
[K3s][Windows Port] Build script, multi-call binary, and Flannel (#7259) 
* initial windows port.

Signed-off-by: Sean Yen <seanyen@microsoft.com>
Signed-off-by: Derek Nola <derek.nola@suse.com>
Co-authored-by: Derek Nola <derek.nola@suse.com>
Co-authored-by: Wei Ran <weiran@microsoft.com>
 2023-10-16 14:53:09 -04:00
Brad Davidson
e5e1a674ce Enable containerd aufs/devmapper/zfs snapshotter plugins 
These were unintentionally dropped when moving containerd back into the main multicall binary

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2023-06-05 15:32:30 -07:00
Brad Davidson
607cbf0ad6 Bump containerd to v1.7.0 and move back into multicall binary 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2023-05-10 08:34:03 -07:00
Hussein Galal
f8b661d590
Update to v1.26.0-k3s1 (#6370) 
* Update to v1.26.0-alpha.2

Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>

* go generate

Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>

* Default CURRENT_VERSION to VERSION_TAG for alpha versions

Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>

* remove containerd package

Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>

* Update k8s to v1.26.0-rc.0-k3s1 cri-tools cri-dockerd and cadvisor

Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>

* replace cri-api reference to the new api

Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>

* go mod tidy

Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>

* Fix version script to allow rc and alphas

Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>

* Fix version script to allow rc and alphas

Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>

* Fix version script to allow rc and alphas

Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>

* Update to Kubernetes 1.26.0-rc.1

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>

* Undo helm-controller pin

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>

* Bump containerd to -k3s2 for stargz fix

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>

* DevicePlugins featuregate is locked to on

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>

* Bump kine for DeleteRange fix

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>

* Update to v1.26.0-k3s1

Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>

* go mod tidy

Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>

* Bring back snapshotter checks and update golang to 1.19.4

Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>

* fix windows containerd snapshotter checks

Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>

Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Co-authored-by: Brad Davidson <brad.davidson@rancher.com>
 2022-12-10 01:42:15 +02:00
Brad Davidson
c8447dca56 Bump golang to 1.18.1 
Also update all use of 'go get' => 'go install', update CI tooling for
1.18 compatibility, and gofmt everything so lint passes.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2022-05-11 14:39:07 -07:00
Dirk Müller
fa0fa8b1d0 Update golangci-lint to 1.45.2 
This requires a further set of gofmt -s improvements to the
code, but nothing major. golangci-lint 1.45.2 brings golang 1.18
support which might be needed in the future.

Signed-off-by: Dirk Müller <dirk@dmllr.de>
 2022-04-13 14:48:42 -07:00
Luther Monson
9a849b1bb7
[master] changing package to k3s-io (#4846) 
* changing package to k3s-io

Signed-off-by: Luther Monson <luther.monson@gmail.com>

Co-authored-by: Derek Nola <derek.nola@suse.com>
 2022-03-02 15:47:27 -08:00
Brad Davidson
6f4217a340 Build standalone containerd 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-12-16 12:00:15 -08:00
Jacob Blain Christen
702fe24afe
containerd/cri: enable the btrfs snapshotter (#4316) 
* vendor: btrfs
* enable the btrfs snapshotter
* testing: snapshotter/btrfs

Signed-off-by: Jacob Blain Christen <jacob@rancher.com>
 2021-10-29 23:31:33 -07:00
Brad Davidson
85e11c47d1 Add StargzSupported stub for Windows 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-09-15 09:45:57 -07:00
Kohei Tokunaga
8b857eef9c
Ship Stargz Snapshotter (#2936) 
* Ship Stargz Snapshotter

Signed-off-by: ktock <ktokunaga.mail@gmail.com>

* Bump github.com/containerd/stargz-snapshotter to v0.8.0

Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
 2021-09-01 16:27:42 -07:00
Akihiro Suda
331c6fed71 Remove runtime V1 (containerd-shim) 
Fix issue 3105

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2021-08-26 11:50:33 -07:00
Brad Davidson
641ab26fde Update containerd to 1.5 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-08-20 18:47:16 -07:00
Jamie Phillips
7345ac35ae
Initial windows support for agent (#3375) 
Signed-off-by: Jamie Phillips <jamie.phillips@suse.com>
 2021-06-01 12:29:46 -07:00
Akihiro Suda
cb73461a5b AkihiroSuda/containerd-fuse-overlayfs -> containerd/fuse-overlayfs-snapshotter 
The repo has been moved.

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2021-03-24 10:34:34 -07:00
Akihiro Suda
05f6255437 add fuse-overlayfs snapshotter (mainly for rootless mode) 
Ubuntu and Debian kernels support mounting real overlayfs inside userns,
but the vanilla kernel still does not allow it.

OTOH fuse-overlayfs can be mounted inside userns with the vanilla kernel (>= 4.18).

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2020-12-01 11:00:00 -08:00
Darren Shepherd
62c62cc7b4 Continued refactoring 2019-01-11 21:52:30 -07:00