Commit Graph

3007 Commits (v1.26.15+k3s1)

Author SHA1 Message Date
Brad Davidson ce5cd41631 Sort snapshots by time and key in tabwriter output
Fixes snapshot list coming out in non-deterministic order

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit a15b804e00)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2023-10-13 10:23:51 -07:00
Brad Davidson 09ab9b7e21 Store extra metadata and cluster ID for snapshots
Write the extra metadata both locally and to S3. These files are placed such that they will not be used by older versions of K3s that do not make use of them.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 7464007037)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2023-10-13 10:23:51 -07:00
Brad Davidson d3335b5093 Move s3 snapshot list functionality to s3.go
Also, don't list ONLY s3 snapshots if S3 is enabled.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 80f909d0ca)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2023-10-13 10:23:51 -07:00
Brad Davidson 7c9a1f3535 Consistently set snapshotFile timestamp
Attempt to use timestamp from creation or filename instead of file/object modification times

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 8d47645312)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2023-10-13 10:23:51 -07:00
Brad Davidson 2459d99cbc Tidy s3 upload functions
Consistently refer to object keys as such, simplify error handling.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit f1afe153a3)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2023-10-13 10:23:51 -07:00
Brad Davidson d1f2836375 Elide old snapshot data when apiserver rejects configmap with ErrRequestEntityTooLarge
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 2b0e2e8ada)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2023-10-13 10:23:51 -07:00
Brad Davidson 9c7115a543 Move etcd snapshot code into separate file
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 676b00aa0e)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2023-10-13 10:23:51 -07:00
Brad Davidson 805fe0be62 Add new CRD for etcd snapshots
Also adds a hack go script to print the embedded CRDs, for developer use.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 500744bb94)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2023-10-13 10:23:51 -07:00
Brad Davidson ed7ac126b5 Minor updates as per design review discussion
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 64107b54e4)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2023-10-13 10:23:51 -07:00
Brad Davidson 46ea3907a1 Add ADR for etcd snapshot CRD migration
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 22065affa2)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2023-10-13 10:23:51 -07:00
Brad Davidson bc4cbb9bfa Bump busybox to v1.36.1
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 9bb1ce1253)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2023-10-13 10:23:51 -07:00
Brad Davidson 1cee852942 Bump containerd to v1.7.7-k3s1
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 5fe4f6709a)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2023-10-13 10:23:51 -07:00
Brad Davidson c239d687ba Pass SystemdCgroup setting through to nvidia runtime options
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 0e5c760625)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2023-10-13 10:23:51 -07:00
Brad Davidson 9edbcb7281 Don't ignore assets in home dir if system assets exist
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 1e38b5d904)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2023-10-13 10:23:51 -07:00
Brad Davidson c25fae4a0f Disable HTTP on main etcd client port
Fixes performance issue under load, ref: https://github.com/etcd-io/etcd/issues/15402 and https://github.com/kubernetes/kubernetes/pull/118460

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 8c73fd670b)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2023-10-13 10:23:51 -07:00
Roberto Bonafiglia 27e3d95a4c Use IPv6 in case is the first configured IP with dualstack
Signed-off-by: Roberto Bonafiglia <roberto.bonafiglia@suse.com>
2023-10-13 10:25:18 +02:00
Derek Nola ad6579a43f
[Release-1.26] Clear remove annotations on cluster reset (#8590)
* Use admin kubeconfig instead of supervisor for etcd snapshot CLI

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>

* Skip creating CRDs and setting up event recorder for CLI controller context

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>

* Don't export functions not needed outside the etcd package

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>

* Reorganize Driver interface and etcd driver to avoid passing context and config into most calls

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>

* Clear remove annotations on cluster reset; refuse to delete last member from cluster

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>

---------

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Co-authored-by: Brad Davidson <brad.davidson@rancher.com>
2023-10-11 16:17:44 -07:00
Derek Nola 8acba4a627
Server Token Rotation (#8577)
* Consolidate NewCertCommands
* Add support for user defined new token
* Add E2E testlets



* Ensure agent token also changes

Signed-off-by: Derek Nola <derek.nola@suse.com>
2023-10-10 09:45:36 -07:00
Roberto Bonafiglia cfb2ef5e3a Fixed tailscale node IP dualstack mode in case of IPv4 only node
Signed-off-by: Roberto Bonafiglia <roberto.bonafiglia@suse.com>
2023-10-10 10:37:54 +02:00
Johnatas db869dfc23
[v1.26] System agent push tags fix (#8570)
* change script and drone

Signed-off-by: Johnatas <johnatasr@hotmail.com>

* adjust secret

Signed-off-by: Johnatas <johnatasr@hotmail.com>

---------

Signed-off-by: Johnatas <johnatasr@hotmail.com>
2023-10-06 17:40:49 -03:00
Vitor Savian a066632d19
Added advertise address integration test
Signed-off-by: Vitor Savian <vitor.savian@suse.com>
2023-10-05 17:11:00 -03:00
Manuel Buil 09e72700ed
Merge pull request #8552 from manuelbuil/netCleanUp126
[Release 1.26] Network defaults are duplicated, remove one
2023-10-05 18:30:22 +02:00
Manuel Buil 3a803fd20e Network defaults are duplicated, remove one
Signed-off-by: Manuel Buil <mbuil@suse.com>
2023-10-04 08:24:44 +02:00
Manuel Buil baca0fc172
Merge pull request #8505 from manuelbuil/IPPrecedence126
[Release 1.26] Take IPFamily precedence based on order
2023-10-03 18:04:30 +02:00
Manuel Buil 8869aab229 Take IPFamily precedence based on order
Signed-off-by: Manuel Buil <mbuil@suse.com>
2023-10-02 18:40:30 +02:00
Manuel Buil 915120c1f0 ipFamilyPolicy:PreferDualStack for coredns and metrics-server
Signed-off-by: Manuel Buil <mbuil@suse.com>
2023-10-02 11:34:55 +02:00
Manuel Buil 40b66fb85a
Merge pull request #8510 from manuelbuil/fixSpellCheck126
[Release 1.26] Fix spellcheck problem (boostrap ==> bootstrap)
2023-09-29 19:14:39 +02:00
Manuel Buil 1d395f63e0 Fix spellcheck problem (boostrap ==> bootstrap)
Signed-off-by: Manuel Buil <mbuil@suse.com>
2023-09-29 16:12:46 +02:00
Manuel Buil 3483aa87e7
Merge pull request #8465 from manuelbuil/vpnExtraArgs126
[Release-1.26] Add extraArgs to tailscale
2023-09-28 10:05:48 +02:00
Vitor Savian 767c9153c1
Added cluster reset from non bootstrap nodes on snapshot restore e2e test
Signed-off-by: Vitor Savian <vitor.savian@suse.com>
2023-09-27 16:43:30 -03:00
Vitor Savian 3dd36d2012
Added error when cluster reset while using server flag
Signed-off-by: Vitor Savian <vitor.savian@suse.com>
2023-09-27 16:42:36 -03:00
Manuel Buil 76bee4bd55 Add extraArgs to tailscale
Signed-off-by: Manuel Buil <mbuil@suse.com>
2023-09-27 11:38:38 +02:00
Roberto Bonafiglia 61f955308d Update kube-router
Signed-off-by: Roberto Bonafiglia <roberto.bonafiglia@suse.com>
2023-09-27 11:01:10 +02:00
Manuel Buil d53f622669
Merge pull request #8436 from manuelbuil/interfaceLog126
[Release 1.26] Include the interface name in the error message
2023-09-26 19:14:25 +02:00
Manuel Buil f8f888f4b6 Include the interface name in the error message
Signed-off-by: Manuel Buil <mbuil@suse.com>
2023-09-26 11:07:44 +02:00
Derek Nola 7d6751713f E2E test for token coverage (#8184)
Signed-off-by: Derek Nola <derek.nola@suse.com>
2023-09-25 13:07:04 -07:00
Derek Nola b577a456c8 Run integration test CI in parallel (#8156)
* Run integration test CI in parallel
* Define go version in E2E

Signed-off-by: Derek Nola <derek.nola@suse.com>
2023-09-25 13:07:04 -07:00
Derek Nola 9cf4272da7 Fix for Kubeflag Integration test (#8154)
* Use argument that doesn't require file
* Use build-k3s workflow in cgroup
* Bump timeout on integration tests

Signed-off-by: Derek Nola <derek.nola@suse.com>
2023-09-25 13:07:04 -07:00
Manuel Buil 2fc9a40f65
Merge pull request #8420 from manuelbuil/flannelErrors126
[Release 1.26] Add context to flannel errors
2023-09-25 16:33:11 +02:00
Manuel Buil 2e3fd7a4b5
Merge pull request #8412 from manuelbuil/logrus126
[Release-1.26] Fix error reporting
2023-09-25 08:48:21 +02:00
Manuel Buil 6c4c157352 Add context to flannel errors
Signed-off-by: Manuel Buil <mbuil@suse.com>
2023-09-25 08:28:22 +02:00
Manuel Buil 23c9208c84 Fix error reporting
Signed-off-by: Manuel Buil <mbuil@suse.com>
2023-09-22 19:04:56 +02:00
Johnatas 4e217286a7
Update to v1.26.9 and go to v1.20.8 (#8357)
* Update to v1.26.9

Signed-off-by: Johnatas <johnatasr@hotmail.com>

* Bump containerd and stargz versions

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>

* Print message on upgrade fail

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>

* Send Bad Gateway instead of Service Unavailable when tunnel dial fails

Works around new handling for Service Unavailable by apiserver aggregation added in kubernetes/kubernetes#119870

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>

* Add 60 seconds to server upgrade wait to account for delays in apiserver readiness

Also change cleanup helper to ensure upgrade test doesn't pollute the
images for the rest of the tests.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>

---------

Signed-off-by: Johnatas <johnatasr@hotmail.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Co-authored-by: Brad Davidson <brad.davidson@rancher.com>
2023-09-19 15:17:55 -03:00
Brad Davidson 38cbe2d5ef Bump kine to v0.10.3
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2023-09-08 13:02:46 -07:00
Brad Davidson 631bb3f0fe Add RWMutex to address controller
Fixes race condition when address map is updated by multiple goroutines

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 0d23cfe038)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2023-08-30 01:34:47 -07:00
Brad Davidson 685aadb8ed Add new CLI flag to enable TLS SAN CN filtering
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2023-08-29 08:35:09 -07:00
Johnatas bff646b6e9
Update to v1.26.8 (#8235)
Signed-off-by: Johnatas <johnatasr@hotmail.com>
2023-08-25 11:11:59 -03:00
Manuel Buil fdc7485ca4
Merge pull request #8222 from manuelbuil/updateFlannel126
[Release 1.26] Move flannel to 0.22.2
2023-08-18 12:04:45 +02:00
Manuel Buil c1987512a1 Move flannel to 0.22.2
Signed-off-by: Manuel Buil <mbuil@suse.com>
2023-08-18 09:22:49 +02:00
Brad Davidson 11482f9ee1 Bump helm-controller/klipper-helm versions
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 84ded911e9)
2023-08-16 13:53:12 -07:00