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

3308 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad Davidson
cc4e044bb6 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:39 -07:00
Brad Davidson
f35165d434 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:39 -07:00
Brad Davidson
b0f98b28e5 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:39 -07:00
Brad Davidson
ad4145b1bf 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:39 -07:00
Brad Davidson
b91b8371bc 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:39 -07:00
Derek Nola
e73db99a88 Launch private registry with init so the container can be killed on cleanup (#11047) 
Signed-off-by: Derek Nola <derek.nola@suse.com>
 2024-10-10 08:52:43 -07:00
manuelbuil
0019d61a58 Add e2e test for advanced fields in services 
Signed-off-by: manuelbuil <mbuil@suse.com>
 2024-10-10 10:30:26 +02:00
Vitor Savian
0a2b383a32 Add user path to runtimes search 
Signed-off-by: Vitor Savian <vitor.savian@suse.com>
 2024-10-08 13:19:18 -03:00
Derek Nola
647fc892db Bump Wharfie to v0.6.7 (#10975) 
Signed-off-by: Derek Nola <derek.nola@suse.com>
 2024-10-03 12:08:01 -07:00
Manuel Buil
7f90785abe Add int test for flannel-ipv6masq 
Signed-off-by: Manuel Buil <mbuil@suse.com>
 2024-09-26 14:48:28 +02:00
Brooks Newberry
9b586704a2 [release-1.30] Update Kubernetes to v1.30.5-k3s2 (#10909) 
Signed-off-by: Brooks Newberry <brooks@newberry.com>
Co-authored-by: Derek Nola <derek.nola@suse.com>
Co-authored-by: Brad Davidson <brad@oatmail.org>
v1.30.5-rc2+k3s1 v1.30.5+k3s1 		2024-09-17 14:40:20 -07:00
Brian Downs
dbbb73e020 Update to v1.30.5 (#10888) v1.30.5-rc1+k3s1 2024-09-13 12:12:36 -07:00
Brad Davidson
ca84f13846 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 15:00:04 -07:00
Brad Davidson
9e06189a7c 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:23 -07:00
Brad Davidson
507f728491 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:23 -07:00
Brad Davidson
3ed73a0efe 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:23 -07:00
Brad Davidson
5bcd734677 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:23 -07:00
Harsimran Singh Maan
f65b540eec 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:23 -07:00
Brad Davidson
2989a7d430 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:23 -07:00
Brad Davidson
0c3a384148 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:23 -07:00
Brad Davidson
dd12197379 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:23 -07:00
dependabot[bot]
925e95efe4 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:23 -07:00
Derek Nola
05dcd7f325 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:23 -07:00
Roberto Bonafiglia
ae5e25f531 Update CNI plugins version 
Signed-off-by: Roberto Bonafiglia <roberto.bonafiglia@suse.com>
 2024-09-04 16:47:21 -07:00
Derek Nola
01faf4ed39 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 11:50:40 -07:00
Derek Nola
e562d883d6 Remove secrets encryption controller (#10612) 
* Remove secrets encryption controller

Signed-off-by: Derek Nola <derek.nola@suse.com>
 2024-09-04 11:50:40 -07:00
Derek Nola
14e11631ca Fix secrets-encrypt metrics 
Signed-off-by: Derek Nola <derek.nola@suse.com>
 2024-09-04 11:50:40 -07:00
Derek Nola
6f099943fc Fix caching name for e2e vagrant box (#10695) 
Signed-off-by: Derek Nola <derek.nola@suse.com>
 2024-09-04 11:50:40 -07:00
Derek Nola
6f91699a69 Update to newer OS images for install testing (#10681) 
* Update to newer OS images for install testing
* Update vagrant images used for E2E

Signed-off-by: Derek Nola <derek.nola@suse.com>
 2024-09-04 11:50:40 -07:00
Brooks Newberry
98262b5dee Update to v1.30.4 (#10721) v1.30.4-rc1+k3s1 v1.30.4+k3s1 2024-08-15 15:01:04 -07:00
Alireza Eskandari
a125b7f623 Add tolerations support for DaemonSet pods 
Signed-off-by: Alireza Eskandari <alireza.eskandari@wsd.com>
(cherry picked from commit 22fb7049bd)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2024-08-12 17:09:45 -07:00
Brad Davidson
b11486d3cd Bump containerd to v1.7.20 (#10660) 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2024-08-06 08:52:01 -07:00
Derek Nola
6965b5d1a9 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-08-06 08:51:16 -07:00
Derek Nola
cebd9dcc2d Use higher QPS for secrets reencryption (#10571) 
* Use higher QPS for secrets reencryption

Signed-off-by: Derek Nola <derek.nola@suse.com>
 2024-08-06 08:51:16 -07:00
Derek Nola
60b2f5ab16 Enhance E2E Hardened option (#10558) 
* Remove unnecessary hardened arguments

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

* slim down hardened arguments

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

---------

Signed-off-by: Derek Nola <derek.nola@suse.com>
 2024-08-06 08:51:16 -07:00
Brad Davidson
7190c74acc [release-1.30] Backports for 2024-08 release cycle (#10664) 
* Use pagination when retrieving etcd snapshot list

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit c2216a62ad)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>

* Update secretsencrypt pagination

Make secretsencrypt page size and iteration consistent with other paginators

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 891e72f90f)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>

* Cap length of generated name used for servicelb daemonset

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 21611c5665)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>

* Fix ipv6 sysctl required by non-ipv6 LoadBalancer service

This is a partial revert of 095ecdb034,
with the workaround moved into klipper-lb.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit d4c3422a85)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>

* remove deprecated use of wait functions

Signed-off-by: Will <will7989@hotmail.com>
(cherry picked from commit e4f3cc7b54)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>

* Update pkg/secretsencrypt/config.go

Co-authored-by: Brad Davidson <brad@oatmail.org>
Signed-off-by: Will Andrews <will7989@hotmail.com>
(cherry picked from commit 3ec086f6f7)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>

* Update pkg/cluster/managed.go

Co-authored-by: Derek Nola <derek.nola@suse.com>
Signed-off-by: Will Andrews <will7989@hotmail.com>
(cherry picked from commit e2179aa957)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>

* Wire lasso metrics up to common gatherer

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit e168438d44)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>

* Fix cloudprovider controller name

Looking at metrics revealed the cloudprovider controller name was anempty string.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit bffdf463e1)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>

---------

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Signed-off-by: Will <will7989@hotmail.com>
Signed-off-by: Will Andrews <will7989@hotmail.com>
Co-authored-by: Will <will7989@hotmail.com>
Co-authored-by: Derek Nola <derek.nola@suse.com>
 2024-08-05 09:35:00 -07:00
Brad Davidson
fa4803843f bump docker/docker to v25.0.6 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2024-08-02 14:38:23 -07:00
Brad Davidson
f646604010 Fix inconsistent loading of config dropins when config file does not exist 
FindString would silently skip parsing dropins if the main config file
didn't exist. If a custom config file path was passed it would raise an
error, but if we were parsing the default config file and it didn't
exist it would just silently fail to load the dropins.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
v1.30.3-rc2+k3s1 v1.30.3+k3s1 		2024-07-29 16:59:57 -07:00
Brad Davidson
ff06b107ed Add K3S_DATA_DIR as env var for --data-dir flag 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2024-07-29 16:59:57 -07:00
Brad Davidson
b5dde94d75 Don't set K3S_DATA_DIR env var 
This was only used to pass the bundled strongswan path through to the flannel ipsec backend, and is no longer needed. Ref: #719

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2024-07-29 16:59:57 -07:00
Brooks Newberry
086d9ca0fa Update to v1.30.3-k3s1 and Go 1.22.5 (#10536) 
Signed-off-by: Brooks Newberry <brooks@newberry.com>
v1.30.3-rc1+k3s1 		2024-07-17 14:33:21 -07:00
Derek Nola
4323964859 [Release-1.30] July Test Backports (#10507) 
* Move test-compat to GHA (#10414)

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

* For E2E upgrade test, automatically determine the channel to use (#10461)

Signed-off-by: Derek Nola <derek.nola@suse.com>
 2024-07-15 10:45:29 -07:00
Brad Davidson
494d6df0cd Don't use server and token values from config file for etcd-snapshot commands 
Fixes an issue where running etcd-snapshot commands on a node that has a server address set in the config will manage snapshots on that server, instead of on the local node as intended.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2024-07-15 10:14:20 -07:00
Brad Davidson
6cb63dd766 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 10:14:20 -07:00
Brad Davidson
280aaa3a79 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 10:14:20 -07:00
Brad Davidson
97250ad656 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 10:14:20 -07:00
Brad Davidson
4bf6fffe45 Fix reentrant rlock in loadbalancer.dialContext 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2024-07-15 10:14:20 -07:00
Brad Davidson
38a4f183bc Bump kine to v0.11.11 
https://github.com/k3s-io/kine/compare/v0.11.9...v0.11.11
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2024-07-15 10:14:20 -07:00
Brad Davidson
bcaa63929f Add etcd s3 config secret implementation 
* Move snapshot structs and functions into pkg/etcd/snapshot
* Move s3 client code and functions into pkg/etcd/s3
* Refactor pkg/etcd to track snapshot and s3 moves
* Add support for reading s3 client config from secret
* Add minio client cache, since S3 client configuration can now be
  changed at runtime by modifying the secret, and don't want to have to
  create a new minio client every time we read config.
* Add tests for pkg/etcd/s3

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit c36db53e54)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2024-07-15 10:14:20 -07:00
github-actions[bot]
c338b31381 chore: Bump Trivy version 
Made with ❤️️ by updatecli

(cherry picked from commit 5508589fae)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2024-07-15 10:14:20 -07:00