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

3513 Commits

This Branch
This Branch
All Branches
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
Derek Nola
e050ca66d1 [Release-1.31] Fix upgrade test container version (#11999) 
* Fix upgrade test container version

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

* Force docker test cleanup in CI

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

* Bump skew test timeout

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

---------

Signed-off-by: Derek Nola <derek.nola@suse.com>
v1.31.7-rc3+k3s1 v1.31.7+k3s1 		2025-03-21 15:31:53 -05:00
Brad Davidson
0ffa790f25 Bump to containerd v2.0.4 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2025-03-21 12:49:29 -07:00
Brooks Newberry
de295ecbee fix skew test container version (#11990) 
Signed-off-by: Brooks Newberry <brooks@newberry.com>
v1.31.7-rc2+k3s1 		2025-03-19 23:42:48 -07:00
Brooks Newberry
536ee715af Update to v1.31.7 (#11958) 
Signed-off-by: Brooks Newberry <brooks@newberry.com>
v1.31.7-rc1+k3s1 		2025-03-12 13:06:56 -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
e434e583e3 Merge pull request #11927 from dereknola/bump_klipper_lb_1.31 
[Release-1.31] Bump klipper-lb to v0.4.13
 2025-03-10 15:17:23 -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
Derek Nola
02c824e036 Fix flaky rootless E2E test 
Signed-off-by: Derek Nola <derek.nola@suse.com>
 2025-03-07 14:46:16 -08:00
Brad Davidson
ca4b30d2cd Bump etcd to v3.5.19 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 0a47df6f60)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2025-03-07 14:46:16 -08: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
ab09acdc20 Bump to containerd v2.0.3/runc v1.2.5 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 66d0f1604a)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2025-03-07 14:46:16 -08:00
Anders Larsson
35e0a96364 Add netfilter statistic module to check-config 
Signed-off-by: Anders Larsson <anders.git@larsson.xyz>
(cherry picked from commit 8aa543eb87)
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
Somesh Bhalsing
5129f24ed2 fix: move CONFIG_SECCOMP to generally necessary category in check-config command 
Signed-off-by: Somesh Bhalsing <somesh.bhalsing@gmail.com>
(cherry picked from commit 6131ea15b2)
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
Brad Davidson
bd9bf89849 Add static bin dir support to k3s docker image 
Static bin dir is first in search path and is on /var/lib/rancher/k3s volume, which can be persisted by users. If the volume is empty it will just fall back to the legacy /bin dir.

(cherry picked from commit b2d495e17f)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2025-03-07 14:46:16 -08:00
Derek Nola
caca8a2846 Move away from docker e2e images, use gcr and ghcr 
Signed-off-by: Derek Nola <derek.nola@suse.com>
 2025-03-05 14:25:40 -08:00
Derek Nola
1558d39634 Migrate svcpolicies E2E test to docker 
Signed-off-by: Derek Nola <derek.nola@suse.com>
 2025-03-05 14:25:40 -08:00
Derek Nola
428065d9b4 Expand E2E test matrix to cover all possible tests that fit on GHA 
Fix rootless test

Fix svc firewall E2E test, broken by #11711

Signed-off-by: Derek Nola <derek.nola@suse.com>
 2025-03-05 14:25:40 -08:00
Derek Nola
86aec412af Replace e2e.ParseNodes function with general ParseNodes and NodesReady test functions 
Signed-off-by: Derek Nola <derek.nola@suse.com>
 2025-03-05 14:25:40 -08:00
Derek Nola
633e50a982 Add E2E AllNodes helper function 
Signed-off-by: Derek Nola <derek.nola@suse.com>
 2025-03-05 14:25:40 -08:00
Derek Nola
931af8d071 Fix typo on conformance script (#11792) 
Signed-off-by: Derek Nola <derek.nola@suse.com>
 2025-03-05 14:25:40 -08:00
Derek Nola
83c71763a2 Migrate E2E SecretsEncryption to Docker test 
Remove secrets encryption E2E from Drone

Signed-off-by: Derek Nola <derek.nola@suse.com>
 2025-03-05 14:25:40 -08:00
Derek Nola
ac91f9567c Don't run snapshotrestore on flaky arm64 runners 
Signed-off-by: Derek Nola <derek.nola@suse.com>
 2025-03-05 14:25:40 -08:00
Derek Nola
0d39edf1ca Migrate E2E autoimport to Docker test 
Simplify DockerNode structs
Remove autoimport from E2E
Signed-off-by: Derek Nola <derek.nola@suse.com>
 2025-03-05 14:25:40 -08:00
Derek Nola
48126c2d9b Remove unused docker tests 
Signed-off-by: Derek Nola <derek.nola@suse.com>
 2025-03-05 14:25:40 -08:00
Derek Nola
20b01f123a Migrate hardened docker test 
Signed-off-by: Derek Nola <derek.nola@suse.com>
 2025-03-05 14:25:40 -08:00
Derek Nola
f7daa0aab7 Fix various E2E test function names and descriptions 
Signed-off-by: Derek Nola <derek.nola@suse.com>
 2025-03-05 14:25:40 -08:00
Derek Nola
0cb44320fd Migrate E2E Token test into a Docker Token test 
Remove E2E token test

Signed-off-by: Derek Nola <derek.nola@suse.com>
 2025-03-05 14:25:40 -08:00
Derek Nola
f1608ea65b Align docker and e2e variable spelling 
Signed-off-by: Derek Nola <derek.nola@suse.com>
 2025-03-05 14:25:40 -08:00
Derek Nola
226640631e Only bump trivy on the minor release (#11773) 
Signed-off-by: Derek Nola <derek.nola@suse.com>
 2025-03-05 14:25:40 -08:00
Derek Nola
1321c918ad Reduce cache thrashing on E2E vagrant boxes. Don't cache for windows unit tests. (#11769) 
Signed-off-by: Derek Nola <derek.nola@suse.com>
 2025-03-05 14:25:40 -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
6ab750f93f Bump containerd for go-cni deadlock fix 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
v1.31.6+k3s1 v1.31.6-rc3+k3s1 		2025-02-21 12:41:13 -08:00
Brad Davidson
a7455eb9ef e2e: wait for deployments before getting logs 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
v1.31.6-rc2+k3s1 		2025-02-20 18:07:58 -08:00
Brad Davidson
00196d2deb e2e: Fix curl test timeouts 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2025-02-20 18:07:58 -08: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
Rafael
50ac0bed10 Update to v1.31.6 (#11787) 
Signed-off-by: Rafael Breno <32229014+rafaelbreno@users.noreply.github.com>
v1.31.6-rc1+k3s1 		2025-02-14 10:21:49 -03: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
9f3a64fcd8 Fix FetchIngressIP error checking 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2025-02-10 10:16:22 -08:00
Brad Davidson
c61b8c077a Move windows build to separate job 
Don't block other linux steps on building the windows binary

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 20a9a6bfc3)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2025-02-10 10:16:22 -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