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

468 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
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
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
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
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
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
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
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
Brad Davidson
91e34f1095 Add client-side certificate generation support 
Clients now generate keys client-side and send CSRs. If the server is down-level and sends a cert+key instead of just responding with a cert signed with the client's public key, we use the key from the server instead.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit caeebc52b7)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2025-01-10 15:48:55 -08:00
Brad Davidson
215b4ca79f Remove unused Certificate field from Node struct 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 5b1d57f7b9)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2025-01-10 15:48:55 -08:00
galal-hussein
2055b9f1bf RBAC changes for compat with AuthorizeNodeWithSelectors 
Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit b4747703b0)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2025-01-10 15:48:55 -08:00
Arne Winter
eff8f18548 add node-internal-dns/node-external-dns address pass-through support (#10852) 
* add --node-internal-dns and --node-external-dns

Signed-off-by: Arne Winter <github@arnewinter.dev>
Co-authored-by: Brad Davidson <brad@oatmail.org>
(cherry picked from commit c4c11e51f1)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2024-12-11 18:56:08 -08:00
Brad Davidson
abbfbba584 Fix agent tunnel address on rke2 
Fix issue where rke2 tunnel was trying to connect to apiserver port instead of supervisor

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 5a5b136151)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2024-12-10 17:01:54 -08:00
Brad Davidson
212c4d2fde Fall back to polling the supervisor for apiserver addresses when the watch fails 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit c7ff957cae)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2024-12-10 17:01:54 -08:00
Brad Davidson
c41e50623c Use helper to set consistent rest.Config rate limits and timeouts 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 71918e0d69)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2024-12-10 17:01:54 -08:00
Brad Davidson
af82d4101f Add loadbalancer metrics 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 3d2fabb013)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2024-12-10 17:01:54 -08:00
Brad Davidson
160d93f76a Refactor load balancer server list and health checking 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 911ee19a93)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2024-12-10 17:01:54 -08:00
Brad Davidson
e9c378bed4 Separate persistent config struct from LoadBalancer and make fields private 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 67fd5fa9e5)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2024-12-10 17:01:54 -08:00
Brad Davidson
cfba0c64f9 Move http/socks proxy stuff to separate file 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 13e9113787)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2024-12-10 17:01:54 -08:00
Brad Davidson
53d4dd85f5 Fix issue with loadbalancer failover to default server 
The loadbalancer should only fail over to the default server if all other server have failed, and it should force fail-back to a preferred server as soon as one passes health checks.

The loadbalancer tests have been improved to ensure that this occurs.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2024-11-14 08:19:28 -08:00
Brad Davidson
a413c5baf7 Add nonroot-devices flag to agent CLI 
Add new flag that is passed through to the device_ownership_from_security_context parameter in the containerd CRI config. This is not possible to change without providing a complete custom containerd.toml template so we should add a flag for it.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 56fb3b0991)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2024-11-06 12:40:51 -08:00
manuelbuil
d74ad4253a Add the nvidia runtime cdi 
Signed-off-by: manuelbuil <mbuil@suse.com>
 2024-10-12 07:38:21 +02:00
Brad Davidson
d907517523 Update tcpproxy for import path change 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 1ae9ca73f5)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2024-10-10 11:40:25 -07:00
Vitor Savian
efa2804d55 Add user path to runtimes search 
Signed-off-by: Vitor Savian <vitor.savian@suse.com>
 2024-10-08 13:18:43 -03:00
Brad Davidson
d926e69073 Fix hosts.toml header var 
Resolves issue from 270f85e468 that prevented old hosts.toml files from being cleaned up.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2024-09-10 14:59:55 -07:00
Brad Davidson
2caa785e17 Only clean up containerd hosts dirs managed by k3s 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 270f85e468)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2024-09-06 11:30:11 -07:00
galal-hussein
5087240e32 Downgrade Microsoft/hcsshim to v0.8.26 
Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
 2024-08-22 14:23:34 -07:00
galal-hussein
20b50426ab Update to v1.31.0 
Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
 2024-08-22 14:23:34 -07:00
Will
e4f3cc7b54 remove deprecated use of wait functions 
Signed-off-by: Will <will7989@hotmail.com>
 2024-07-29 16:23:17 -07:00
Derek Nola
a70157c12e Allow Pprof and Superisor metrics in standalone mode (#10576) 
* Allow pprof to run on server with `--disable-agent`
* Allow supervisor metrics to run on server with `--disable-agent`

Signed-off-by: Derek Nola <derek.nola@suse.com>
 2024-07-26 11:23:57 -07:00
Brad Davidson
cb6bf74bc4 Add dial duration to debug error message 
This should give us more detail on how long dials take before failing, so that we can perhaps better tune the retry loop in the future.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2024-07-15 09:46:52 -07:00
Brad Davidson
118acabec2 Fix IPv6 primary node-ip handling 
I should have caught `[]string{cfg.NodeIP}[0]` and `[]string{envInfo.NodeIP.String()}[0]` in code review...

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2024-07-15 09:46:52 -07:00
Brad Davidson
9841517457 Fix agents removing configured supervisor address 
We shouldn't be replacing the configured server address on agents. Doing
so breaks the agent's ability to fall back to the fixed registration
endpoint when all servers are down, since we replaced it with the first
discovered apiserver address. The fixed registration endpoint will be
restored as default when the service is restarted, but this is not the
correct behavior. This should have only been done on etcd-only nodes
that start up using their local supervisor, but need to switch to a
control-plane node as soon as one is available.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2024-07-15 09:46:52 -07:00
Brad Davidson
9d0c2e0000 Fix reentrant rlock in loadbalancer.dialContext 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2024-07-15 09:46:52 -07:00
Brad Davidson
eb8bd15889 Ensure remotedialer kubelet connections use kubelet bind address 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2024-07-10 13:00:25 -07:00
Roberto Bonafiglia
faeaf1b01b Update flannel to v0.25.4 and fixed issue with IPv6 mask 
Signed-off-by: Roberto Bonafiglia <roberto.bonafiglia@suse.com>
 2024-07-01 18:57:34 +02:00
Brad Davidson
b4d4ed8f01 Fix agent supervisor port using apiserver port instead 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2024-06-13 15:13:21 -07:00
Harrison Affel
f10cb29534 fix typo, use rancher/permissions 
Signed-off-by: Harrison Affel <harrisonaffel@gmail.com>
 2024-06-07 08:00:44 -07:00
Brad Davidson
c0450a2cb4 Fix race condition panic in loadbalancer.nextServer 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2024-06-07 07:39:48 -07:00
fmoral2
043b1eac5d Add test for isValidResolvConf (#10302) 
Signed-off-by: Francisco <francisco.moral@suse.com>
 2024-06-06 17:02:31 -03:00