Commit Graph

3502 Commits

Author SHA1 Message Date
Aaron Dewes
fd4d3be4d4 fix: Use proper key when signing kubelet certificate
I assume this was a mistake when copying and the kubelet key should have been used here.

This bug was introduced in #11471.

Signed-off-by: Aaron Dewes <aaron@nirvati.org>
(cherry picked from commit 147a3c0daf)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2025-04-11 14:51:55 -07:00
Derek Nola
cb50fe1472 Address slow arm docker node startup
Signed-off-by: Derek Nola <derek.nola@suse.com>
(cherry picked from commit b5704e2623)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2025-04-11 14:51:55 -07:00
Derek Nola
0d63ecdd38 chore: bump kine to v0.13.13
Signed-off-by: Derek Nola <derek.nola@suse.com>
(cherry picked from commit e4c8ae4248)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2025-04-11 14:51:55 -07:00
github-actions[bot]
033371cc48 Bump Klipper Helm and Helm Controller version (#12026)
* chore: Bump Klipper Helm and Helm Controller version

Made with ❤️️ by updatecli

* chore: Bump Klipper Helm and Helm Controller version

Made with ❤️️ by updatecli

* Fix build

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

---------

Signed-off-by: Derek Nola <derek.nola@suse.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Derek Nola <derek.nola@suse.com>
(cherry picked from commit 2fdc6fab07)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2025-04-11 14:51:55 -07:00
Brad Davidson
94073174ee Fix windows socket prefix
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit f5b0d7884f)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2025-04-11 14:51:55 -07:00
Brad Davidson
1b87987616 Move Windows test out of Install Script workflow
Placing this in the install script test, which only runs when specific files are changed, was preventing it from being run on code changes.

In addition to moving this into the integration workflow, fix codecov for Windows and upload data after running a test pod.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit cd4be0b8c1)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2025-04-11 14:51:55 -07:00
Derek Nola
a2f43a36da Consolidate build-k3s GHA workflow for OS and ARCH (#12080)
Signed-off-by: Derek Nola <derek.nola@suse.com>
(cherry picked from commit 7c552f89c8)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2025-04-11 14:51:55 -07:00
Brad Davidson
7283bff350 Silence vagrant progress output
Add --no-tty flag to all `vagrant up` commands to silence the printing of box loading progress

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 08c6c7423b)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2025-04-11 14:51:55 -07:00
Brad Davidson
a2092dfd60 Add ReusePort/ReuseAddr flags to etcd config
Addresses flakes in etcd CI due to the port still being in TIME_WAIT after the server is shut down between tests

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 9deef77eef)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2025-04-11 14:51:55 -07:00
Brad Davidson
4a07c85a5a Bump to traefik/v2.11.22, coredns/v1.12.1
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 7cdf0fa688)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2025-04-11 14:51:55 -07:00
manuelbuil
53bb385ac2 Add error in certificate check
Signed-off-by: manuelbuil <mbuil@suse.com>
2025-04-11 13:37:42 -07:00
Derek Nola
c2d1127b96 Remove double error check
Signed-off-by: Derek Nola <derek.nola@suse.com>
2025-04-09 01:01:01 -04:00
Derek Nola
ab43902c9c Align Value CLI
Signed-off-by: Derek Nola <derek.nola@suse.com>
2025-04-09 01:01:01 -04:00
Derek Nola
de84453eb2 Mark rotate-keys as GA
Signed-off-by: Derek Nola <derek.nola@suse.com>
2025-04-09 01:01:01 -04:00
Derek Nola
824f2710ad Implement secrets-encryption secretbox provider
- Add testlet for new provider switch
- Handle migration between providers
- Add exception for criticalcontrolargs
Signed-off-by: Derek Nola <derek.nola@suse.com>
2025-04-09 01:01:01 -04:00
Derek Nola
105afd54d4 Cleanup anonymous and named volumes for docker tests (#12077)
Signed-off-by: Derek Nola <derek.nola@suse.com>
2025-04-08 16:54:31 -04:00
Brad Davidson
1179fad73d Fix flakey etcd startup tests
Increase etcd shutdown delay to avoid "bind: address already in use" errors seen in CI. Also uses test TmpDir to ensure dir is cleaned up between tests.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2025-04-02 11:40:03 -07:00
Brad Davidson
becff1d603 Add tests for control-plane component arg generation
Use mocked executor to ensure the correct args are being passed to components

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 1ba19856de)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2025-04-02 11:40:03 -07:00
Brad Davidson
b7f262315d Fix issue caused by default authorization-mode apiserver arg
Move arg-parsing helper functions into util, and use them to see if the user has set an authorization-config flag - and do not set authorization-mode if so.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit ee036f7bc9)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2025-04-02 11:40:03 -07:00
Brad Davidson
62e7b907f7 Rework mock executor using gomock for call validation
Generate the mock executor with mockgen and convert existing uses of the mock executor to set it up properly.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 0eeac6a622)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2025-04-02 11:40:03 -07:00
Brad Davidson
3a2143b1ce Move etcd ready channel into executor
This eliminates the final channel that was being passed around in an internal struct. The ETCD management code passes in a func that can be polled until etcd is ready; the executor is responsible for polling this after etcd is started and closing the etcd ready channel at the correct time.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit d45006be66)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2025-03-31 17:07:08 -07:00
Brad Davidson
77c6523d7f Fix etcd tests to use mock executor
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 72bbd676f1)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2025-03-31 17:07:08 -07:00
Brad Davidson
905e2ea199 Move container runtime ready channel into executor
Move the container runtime ready channel into the executor interface, instead of passing it awkwardly between server and agent config structs

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit a8bc412422)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2025-03-31 17:07:08 -07:00
Brad Davidson
79e7f711e7 Move apiserver ready wait into common channel
Splits server startup into prepare/start phases. Server's agent is now
started after server is prepared, but before it is started. This allows
us to properly bootstrap the executor before starting server components,
and use the executor to provide a shared channel to wait on apiserver
readiness.

This allows us to replace four separate callers of WaitForAPIServerReady
with reads from a common ready channel.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 529e748ac7)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2025-03-31 17:07:08 -07:00
Brad Davidson
81eff3f0cb Increase log output while waiting for apiserver ready
Increases log verbosity but decreases polling frequency to avoid
spamming the console. It usually takes a couple seconds for the
apiserver to come up anyway.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 2c133692b2)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2025-03-31 17:07:08 -07:00
Brad Davidson
a788949777 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:07:08 -07:00
Derek Nola
c2662fbee6 [Release-1.30] Fix upgrade test container version (#11998)
* 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 deployment times

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

---------

Signed-off-by: Derek Nola <derek.nola@suse.com>
v1.30.11+k3s1
2025-03-21 15:31:42 -05:00
Brooks Newberry
e1d750fd17 fix skew test container version (#11989)
Signed-off-by: Brooks Newberry <brooks@newberry.com>
v1.30.11-rc2+k3s1
2025-03-20 02:25:12 -07:00
Brooks Newberry
09639a7f54 Update to v1.30.11 (#11959)
Signed-off-by: Brooks Newberry <brooks@newberry.com>
v1.30.11-rc1+k3s1
2025-03-12 13:07:00 -07:00
Brad Davidson
0f0a157e72 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-12 00:25:23 -07:00
Derek Nola
3c8c398ad5 Merge pull request #11928 from dereknola/bump_klipper_lb_1.30
[Release-1.30] Bump klipper-lb to v0.4.13
2025-03-10 15:17:27 -07:00
Derek Nola
86d47b0069 Bump klipper-lb image (#11898)
Signed-off-by: Derek Nola <derek.nola@suse.com>
2025-03-10 11:32:39 -07:00
Derek Nola
f82e387b5e Fix flaky rootless E2E test
Signed-off-by: Derek Nola <derek.nola@suse.com>
2025-03-07 14:46:22 -08:00
Brad Davidson
ba2e5cf655 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:22 -08:00
Brad Davidson
59ccd4bc7c 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:22 -08:00
Brad Davidson
9e05875030 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:22 -08:00
Brad Davidson
fe0396c977 Bump to containerd v2.7.26/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:22 -08:00
Anders Larsson
acec2794ba 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:22 -08:00
Brad Davidson
064978cdf1 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:22 -08:00
Brad Davidson
7120e63a06 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:22 -08:00
Brad Davidson
5d5d6ee18a 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:22 -08:00
Brad Davidson
c607ba85a5 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:22 -08:00
Brad Davidson
43b24315f1 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:22 -08:00
Somesh Bhalsing
4bc4aeaf24 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:22 -08:00
Brad Davidson
edc5203598 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:22 -08:00
Brad Davidson
adb495931b 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:22 -08:00
Derek Nola
7c317ee270 Move away from docker e2e images, use gcr and ghcr
Signed-off-by: Derek Nola <derek.nola@suse.com>
2025-03-05 14:25:32 -08:00
Derek Nola
37b0d0184f Migrate svcpolicies E2E test to docker
Signed-off-by: Derek Nola <derek.nola@suse.com>
2025-03-05 14:25:32 -08:00
Derek Nola
d5f5b66dc5 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:32 -08:00
Derek Nola
9e780afebd 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:32 -08:00