Commit Graph

3362 Commits

Author SHA1 Message Date
Brad Davidson
4e86699dfd Bump containerd to v1.7.23-k3s1
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 9c32f83819)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2024-11-06 12:40:51 -08:00
Brad Davidson
e4c2c40a1e Fix MustFindString returning override flags on external CLI commands
External CLI actions cannot short-circuit on --help or --version, so we
cannot skip loading the config file if these flags are present when
running these wrapped commands. The behavior of just returning the
override flag name instead of the requested flag value was breaking
data-dir lookup when running wrapped commands.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit ff5c633fe7)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2024-11-06 12:40:51 -08:00
Brad Davidson
e79ef532ad Bump runc to v1.2.1
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 917761ce54)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2024-11-06 12:40:51 -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
Brad Davidson
6459d778ad Fix git-sha warning in etcd startup logs
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit b67249ec77)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2024-11-06 12:40:51 -08:00
Brad Davidson
4acd18720c Set kine EmulatedETCDVersion from embedded etcd version
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit bc60ff79f6)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2024-11-06 12:40:51 -08:00
Brad Davidson
802bf84d39 Add tests for ETCD.Test()
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit a39e191906)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2024-11-06 12:40:51 -08:00
Brad Davidson
7ce7044a15 Fix issues with defragment and alarm clear on etcd startup
* Use clientv3.NewCtxClient instead of New to avoid automatic retry of all RPCs
* Only timeout status requests; allow defrag and alarm clear requests to run to completion.
* Only clear alarms on the local cluster member, not ALL cluster members

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 095e34d816)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2024-11-06 12:40:51 -08:00
Brad Davidson
6632292d08 Bump etcd to v3.5.16-k3s1
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit e34fe0343f)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2024-11-06 12:40:51 -08:00
Derek Nola
3517f9bbdd [Release-1.31] Backport E2E GHA fixes (#11230)
* Fix Github Actions for Ubuntu-24.04 (#11112)

* Fix vagrant/libvirt composite action for ubuntu-24.04

* Don't ignore changes to internal actions

* Fix unit tests for ubuntu 24.04, new lsof version

* Pin os version for unit and E2E workflows

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

* Pin vagrant to older version to avoid known issue 13527

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

---------

Signed-off-by: Derek Nola <derek.nola@suse.com>
2024-11-04 20:26:51 -08:00
Brooks Newberry
6da204241b [release-1.31] Update Kubernetes to v1.31.2 (#11155)
Signed-off-by: Brooks Newberry <brooks@newberry.com>
v1.31.2+k3s1 v1.31.2-rc2+k3s1
2024-10-23 15:30:23 -07:00
Brad Davidson
221ab22ca9 Unlink existing CNI bin symlinks
Fixes "file exists" error when upgrading k3s.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2024-10-21 10:58:47 -07:00
Derek Nola
0955fa330f [Release-1.31] Revert "Make svclb as simple as possible" (#11118)
* Revert "Make svclb as simple as possible"

This reverts commit 1befd65a0a.

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

* Pin E2E tests to 22.04

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

---------

Signed-off-by: manuelbuil <mbuil@suse.com>
Signed-off-by: Derek Nola <derek.nola@suse.com>
Co-authored-by: manuelbuil <mbuil@suse.com>
2024-10-15 22:34:46 -07:00
manuelbuil
d74ad4253a Add the nvidia runtime cdi
Signed-off-by: manuelbuil <mbuil@suse.com>
2024-10-12 07:38:21 +02:00
manuelbuil
46cfd2cf55 Make svclb as simple as possible
Signed-off-by: manuelbuil <mbuil@suse.com>
2024-10-11 15:51:09 +02:00
Brad Davidson
893019d471 Bump containerd to v1.7.22
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2024-10-10 15:37:05 -07:00
Derek Nola
5159131543 Allow additional Rootless CopyUpDirs through K3S_ROOTLESS_COPYUPDIRS env variable (#11041)
Signed-off-by: Ludo Stellingwerff <ludo.stellingwerff@gmail.com>
Signed-off-by: Derek Nola <derek.nola@suse.com>
Co-authored-by: Ludo Stellingwerff <ludo@almende.org>
2024-10-10 13:14:03 -07:00
Brad Davidson
0ec9894e47 Bump helm-controller and klipper-helm
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 7552203fc5)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2024-10-10 11:40:25 -07:00
Brad Davidson
6ce4d153f7 Bump local-path-provisioner to v0.0.30
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit b0ad6d846d)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2024-10-10 11:40:25 -07:00
github-actions[bot]
ac3ea1233c chore: Bump Local Path Provisioner version
Made with ❤️️ by updatecli

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit c00af8e95e)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2024-10-10 11:40:25 -07: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
Brad Davidson
270e1e0390 Fix issue that caused passwd file and psk to be regenerated when rotating CA certs
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit c6392c9ffc)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2024-10-10 11:40:25 -07:00
Brad Davidson
4b17bd10be Add ca-cert rotation integration test
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit b1a42e5d43)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2024-10-10 11:40:25 -07:00
Brad Davidson
be9338d649 Fix race condition when multiple nodes reconcile S3 snapshots
Don't delete s3 etcdsnapshotfiles if they are missing from s3 but less than a minute old, its possible the other node just finished uploading it and the object key has not yet become visible.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 0826ebc142)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2024-10-10 11:40:25 -07:00
Brad Davidson
e27aa1326e Fix sqlite endpoint when migrating from sqlite to etcd
Support for 'sqlite' as the endpoint was removed in
https://github.com/k3s-io/kine/pull/320 and the constant removed in
https://github.com/k3s-io/kine/pull/325

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 0942e6a0c5)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2024-10-10 11:40:25 -07:00
Brad Davidson
5b4c5063bb Bump kine
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit c9e7b05971)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2024-10-10 11:40:25 -07:00
Brad Davidson
1b6cc33053 Bump traefik to chart 27.0.2 / appVersion v2.11.10
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 6c6d87d1b0)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2024-10-10 11:40:25 -07:00
Brad Davidson
01746f3c33 Bump kine to v0.13.0
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit cda31ebd67)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2024-10-10 11:40:25 -07:00
Brad Davidson
70bdaeb481 Use static CNI bin dir
Maintain a separate dir for CNI binaries so that additional plugins can be installed in a predictable location that does not change every time k3s is upgraded.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit ed14f7f863)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2024-10-10 11:40:25 -07:00
Derek Nola
41529ae5ee Launch private registry with init so the container can be killed on cleanup (#11048)
Signed-off-by: Derek Nola <derek.nola@suse.com>
2024-10-10 08:52:26 -07:00
manuelbuil
2df73c452a Add e2e test for advanced fields in services
Signed-off-by: manuelbuil <mbuil@suse.com>
2024-10-10 10:30:34 +02: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
Derek Nola
f7b482642a Bump Wharfie to v0.6.7 (#10974)
Signed-off-by: Derek Nola <derek.nola@suse.com>
2024-10-03 12:08:04 -07:00
Manuel Buil
4031dc2c43 Add int test for flannel-ipv6masq
Signed-off-by: Manuel Buil <mbuil@suse.com>
2024-09-26 14:48:34 +02:00
Brooks Newberry
452dbbc14c update kubernetes to v1.31.1-k3s3 (#10910)
Signed-off-by: Brooks Newberry <brooks@newberry.com>
v1.31.1+k3s1 v1.31.1-rc2+k3s1
2024-09-17 13:43:25 -07:00
Brooks Newberry
9ae2c39004 Update Kubernetes to v1.31.1 (#10895)
* update Kubernetes to v1.31.1 and Go to 1.22.6

Signed-off-by: Brooks Newberry <brooks@newberry.com>
v1.31.1-rc1+k3s1
2024-09-13 15:59:22 -07: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
Brad Davidson
4c8ef7f477 Fix rotateca validation failures when not touching default self-signed CAs
Also silences warnings about bootstrap fields that are not intended to be handled by CA rotation

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit fe3324cb84)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2024-09-06 11:30:11 -07:00
Brad Davidson
0c8d3c0d58 Bump helm-controller for skip-verify/plain-http and updated tolerations
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 662799feec)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2024-09-06 11:30:11 -07:00
Brad Davidson
db3cf9370e Bump containerd to v1.7.21, runc to v1.1.14
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit d746073bd0)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2024-09-06 11:30:11 -07:00
Harsimran Singh Maan
28a1fd0302 Update coredns to 1.11.3 and metrics-server to 0.7.2
Used https://github.com/coredns/corefile-migration to
migrate the corefile. There are no changes for the
default file from 1.10.1 to 1.11.3.

Notable plugin changes include the k8s_external with fallthrough option
and rewrite with cname_target option.

These changes are not part of the default config that ships
with k3s. Customers using these two plugins can start using the new options

Metrics does not have any new features other than build tooling updates.

Requires https://github.com/rancher/image-mirror/pull/704

Signed-off-by: Harsimran Singh Maan <maan.harry@gmail.com>
(cherry picked from commit 0b4d2497e5)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2024-09-06 11:30:11 -07:00
Brad Davidson
944b3b2830 Bump traefik to v2.11.8
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit bd45aa5c45)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2024-09-06 11:30:11 -07:00
Brad Davidson
703e7697b0 Tag PR image build as latest before scanning
This is less effort than passing the tag across steps 🤷‍♂️

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 378edb939d)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2024-09-06 11:30:11 -07:00
Brad Davidson
88d5576be6 Fix /trivy action running against target branch instead of PR branch
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 3d6e4a793a)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2024-09-06 11:30:11 -07:00
dependabot[bot]
9c537cb705 Bump aquasecurity/trivy-action from 0.20.0 to 0.24.0 (#10795)
Bumps [aquasecurity/trivy-action](https://github.com/aquasecurity/trivy-action) from 0.20.0 to 0.24.0.
- [Release notes](https://github.com/aquasecurity/trivy-action/releases)
- [Commits](https://github.com/aquasecurity/trivy-action/compare/0.20.0...0.24.0)

---
updated-dependencies:
- dependency-name: aquasecurity/trivy-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
(cherry picked from commit dacc636cf4)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2024-09-06 11:30:11 -07:00
Derek Nola
be60661f18 Add trivy scanning trigger for PRs (#10758)
Signed-off-by: Derek Nola <derek.nola@suse.com>
(cherry picked from commit fa6940d03d)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2024-09-06 11:30:11 -07:00
Roberto Bonafiglia
e0c4e60171 Update CNI plugins version
Signed-off-by: Roberto Bonafiglia <roberto.bonafiglia@suse.com>
2024-09-05 11:38:17 -07:00
Derek Nola
3923e0c699 Cover edge case when on new minor release for E2E upgrade test (#10781)
Signed-off-by: Derek Nola <derek.nola@suse.com>
2024-09-04 13:55:37 -07:00
Derek Nola
8bfcfd70cc Fix deploy latest commit on E2E tests (#10725)
Signed-off-by: Derek Nola <derek.nola@suse.com>
2024-09-04 13:55:37 -07:00