public/k3s
1
0
Fork 0
mirror of https://git.vectorsigma.ru/public/k3s.git synced 2026-08-03 20:20:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,513 Commits 31 Branches 949 Tags
f13bf11348eaecbbec3f84938d75bd19b0e482f1
Commit Graph

1505 Commits

Author SHA1 Message Date
Brad Davidson
f13bf11348 Add context to agent token validation error 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit c11c06cad4)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2025-03-31 17:22:44 -07:00
Derek Nola
51fb5b7843 Migrate to UrfaveCLI v2 (#11831) (#12030) 
* Bump rootlesskit tov 1.1.1, last of the v1 line
* Migrate to urfavecli v2
* Disable StringSlice seperattion

Signed-off-by: Derek Nola <derek.nola@suse.com>
 2025-03-31 13:39:46 -07:00
Brad Davidson
e566886305 Fix syncing empty list of apiserver addresses during initial startup 
Also add more debug logging to the sync process.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 781640ecea)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2025-03-11 20:28:51 -07:00
Derek Nola
310ce7a63f Bump klipper-lb image (#11898) 
Signed-off-by: Derek Nola <derek.nola@suse.com>
 2025-03-10 11:32:37 -07:00
Brad Davidson
6adca198c7 Add periodic background snapshot reconcile 
Interval is configurable with new etcd-snapshot-reconcile-interval flag

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit d694dd1db9)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2025-03-07 14:46:16 -08:00
Brad Davidson
3cb6c2dc92 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>
(cherry picked from commit bed1f66880)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2025-03-07 14:46:16 -08:00
Brad Davidson
79a15a3258 Fix panic when secret-encrypt status is checked before runtime core is ready 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit e7b52cd63d)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2025-03-07 14:46:16 -08:00
Brad Davidson
936e9a0f2e Use etcd proxy to bootstrap control-plane-only nodes, if possible 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit f940368747)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2025-03-07 14:46:16 -08:00
Brad Davidson
62fbed7ed5 Use existing server-CA and hash if available 
Also wraps errors along the cluster prepare path to improve tracability.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 244bfd0c35)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2025-03-07 14:46:16 -08:00
Brad Davidson
58168ac103 Serve HTTP bootstrap data from datastore before disk 
Fixes issue where CA rotation would fail on servers with join URL set due to using old data from disk on other server

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 53fcadc028)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2025-03-07 14:46:16 -08:00
Brad Davidson
cc21eb0e4d Move CR APIs to k3s-io/api 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 5894af30ff)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2025-03-07 14:46:16 -08:00
Brad Davidson
ea2716f419 Add etcd snapshot metrics 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 6199b79f4b)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2025-03-07 14:46:16 -08:00
Roberto Bonafiglia
58b9bcba0f Revert "Add ability to pass configuration options to flannel backend" 
This reverts commit 8643576985.

Signed-off-by: Roberto Bonafiglia <roberto.bonafiglia@suse.com>
 2025-03-05 08:06:32 +01:00
Brad Davidson
06981c7856 Fix missing migration for containerd registry.configs plugin namespace 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2025-02-20 18:07:58 -08:00
Brad Davidson
103e6b338d Render CNI dir config whenever vars are set 
RKE2 on Windows sets CNI bin dirs in node config even though embedded flannel is disabled (NoFlannel=true). We need to gate rendering this config on the vars being, set NOT on NoFlannel being false.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2025-02-20 18:07:58 -08:00
Brad Davidson
39b54b9fd3 Bump traefik to v2.11.20 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2025-02-10 14:02:52 -08:00
Brad Davidson
ad668b3897 Update containerd config schema to version 3 
Ref: https://github.com/containerd/containerd/blob/release/2.0/docs/cri/config.md

Since this is a breaking change, add support for a new v3 template file. If no v3 template is present, fall back to checking for the legacy v2 template and render the old structure.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit bc45972398)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2025-02-10 10:16:22 -08:00
Brad Davidson
9b003e9a9e Upgrade containerd to v2.0.2 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 124e46bccf)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2025-02-10 10:16:22 -08:00
Brad Davidson
638a18eec3 Skip netpol startup on windows instead of panicing 
Netpol startup is skipped with a warning on linux if ipset support is missing, we should do the same on windows

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 96c2dd3865)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2025-02-10 10:16:22 -08:00
Brad Davidson
2d095cdec2 Add linux nodeSelector to local-storage and metrics-server 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 99f4f5ad12)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2025-02-10 10:16:22 -08:00
Brad Davidson
814933ec57 Fix default pause image on windows 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 85987ac23f)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2025-02-10 10:16:22 -08:00
Brad Davidson
f3b43c78ca Add missing windows runtime type definition 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 50326c8bca)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2025-02-10 10:16:22 -08:00
Brad Davidson
815a9a5476 Fix windows path quoting/escaping in containerd config template 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 8aa412ed66)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2025-02-10 10:16:22 -08:00
Brad Davidson
1ad3551b36 Fix containerd hosts.toml path on windows 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit bf97b8facc)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2025-02-10 10:16:22 -08:00
Brad Davidson
111b931e6e Fix permissions checks on windows 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 838d68777f)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2025-02-10 10:16:22 -08:00
Brad Davidson
f881585444 Replace hardcoded unix-style paths in test 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit b2418ba354)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2025-02-10 10:16:22 -08:00
Brad Davidson
f8cdc5e582 Remove broken unused windows test 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 8f85ee3c60)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2025-02-10 10:16:22 -08:00
Brad Davidson
a516650d8d Make etcd test linux-only 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 4cacf6e1c0)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2025-02-10 10:16:22 -08:00
Brad Davidson
4b76a60435 Fix linux-specific clientaccess test 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 0d15457c77)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2025-02-10 10:16:22 -08:00
Brad Davidson
84522f0229 Consolidate linux and windows containerd config templates 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 85b3775071)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2025-02-10 10:16:22 -08:00
Brad Davidson
91ad6253e6 Add support for AWS shared credentials file 
Also adds a CLI flag and fields for session token, which must be passed
alongside the access key and secret when using temporary credentials.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 0d028a2283)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2025-02-10 10:16:22 -08:00
github-actions[bot]
7b483c4b0c Bump Local Path Provisioner version (#11657) 
* chore: Bump Local Path Provisioner version

Made with ❤️️ by updatecli

* chore: Bump Local Path Provisioner version

Made with ❤️️ by updatecli

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
(cherry picked from commit 28300ea154)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2025-02-10 10:16:22 -08:00
Brad Davidson
4c19ad1386 Update p2p boostrap helpers for Spegel v0.0.30 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 95700aa6b3)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2025-02-10 10:16:22 -08:00
Brad Davidson
497ca90705 Disable s3 transport transparent compression/decompression 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit fd8348324d)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2025-02-10 10:16:22 -08:00
Derek Nola
a0af200b28 chore: Bump klipper-lb and klipper-helm (#11595) 
* Bump klipper-lb to v0.4.10

Bump klipper-helm to v0.9.4
Signed-off-by: Derek Nola <derek.nola@suse.com>

* Bump helm-controller

Signed-off-by: Derek Nola <derek.nola@suse.com>

---------

Signed-off-by: Derek Nola <derek.nola@suse.com>
(cherry picked from commit 08c30f5ae6)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2025-02-10 10:16:22 -08:00
Maja Bojarska
d18653caff Align etcd-snapshot-dir default path description 
The effective snapshot dir is "${data-dir}/server/db/snapshots". The
server segment is missing in the CLI-reported default path, potentially
misleading the user about the actual default snapshot destination.

Signed-off-by: Maja Bojarska <majabojarska98@gmail.com>
(cherry picked from commit 646e3135bc)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2025-02-10 10:16:22 -08:00
manuelbuil
03b6d1d887 Correct the k3s token command help 
Signed-off-by: manuelbuil <mbuil@suse.com>
 2025-01-30 12:08:36 +01:00
Brad Davidson
56ec5dd4d0 Update tests 
Also add an ordinal to subtests so its easier to figure out which one is failing

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2025-01-23 19:19:15 -08:00
Brad Davidson
c56925f510 Remove local restriction for deferred node password validation 
Restricting deferred node password validation to only requests from the local node is not possible without breaking split-role cluster cold start. There are too many cases where node password secrets may not yet be available due to the apiserver not being up.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2025-01-23 19:19:15 -08:00
Brad Davidson
c4bbfc3af5 Fix local password validation when bind-address is set 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit d0ea741b13)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2025-01-15 15:13:55 -08:00
Hussein Galal
ed9df164c2 Load kernel modules for nft in agent setup (#11596) 
Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
 2025-01-14 00:16:10 +02:00
Derek Nola
41a261ed7c Add "k3s certificate check" clause for better test coverage (#11485) 
* Add "k3s certificate check" clause for better test coverage

Signed-off-by: Derek Nola <derek.nola@suse.com>

* Add table support to cert check

Signed-off-by: Derek Nola <derek.nola@suse.com>

---------

Signed-off-by: Derek Nola <derek.nola@suse.com>
 2025-01-13 12:16:44 -08:00
Vitor Savian
2e419c771d Add auto import images for containerd image store 
* Add auto import images for containerd image store

* Add auto import images

Signed-off-by: Vitor Savian <vitor.savian@suse.com>

* Fix EOF error log when importing tarball files

Signed-off-by: Vitor Savian <vitor.savian@suse.com>

* Delaying queue

Signed-off-by: Vitor Savian <vitor.savian@suse.com>

* Add parse for images

Signed-off-by: Vitor Savian <vitor.savian@suse.com>

---------

Signed-off-by: Vitor Savian <vitor.savian@suse.com>
 2025-01-11 01:59:24 -03:00
muicoder
594444e9dd Update Traefik to v2.11.18 
#11501
Signed-off-by: muicoder <muicoder@gmail.com>
(cherry picked from commit 0144d9b749)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2025-01-10 15:48:55 -08:00
Brad Davidson
a4dba5bbd2 Add tests for supervisor request handlers 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit f345697c0a)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2025-01-10 15:48:55 -08:00
Brad Davidson
ba74aa8a1a Replace *core.Factory with CoreFactory interface 
Make this field an interface instead of pointer to allow mocking. Not sure why wrangler has a type that returns an interface instead of just making it an interface itself. Wrangler in general is hard to mock for testing.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit e6327652f0)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2025-01-10 15:48:55 -08:00
Brad Davidson
7f8f469a29 Move additional core/v1 mocks into tests package 
Convert nodepassword tests to use shared mocks

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit c20c06373a)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2025-01-10 15:48:55 -08:00
Brad Davidson
516e3bf32a Move core/v1 mock into tests package for reuse 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 8f8cfb56b5)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2025-01-10 15:48:55 -08:00
Brad Davidson
2d070579da Add test for join existing cluster 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit f8271d8506)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2025-01-10 15:48:55 -08:00
Brad Davidson
8133debaff Handle cluster join as create if we're the only member 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 365372441b)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2025-01-10 15:48:55 -08:00