github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
1,989 Commits
32 Branches
881 Tags
632 MiB
Commit Graph

1989 Commits (c938d93216f8a742b9c1f8e1cd1ea4be6c93a3e2)

Author SHA1 Message Date
Brad Davidson c938d93216 Add etcd sonobuoy tests 
Closes a gap in test coverage. Also fixes an issue where args and hooks
from previous test runs were not being reset for subsequent runs.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 52e450f033)
 2021-12-22 12:41:36 -08:00
Brad Davidson c130c11064 Add variable to enforce max test concurrency 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 9919f229b6)
 2021-12-22 12:41:36 -08:00
Brad Davidson c030ae5c2c Fix previous channel detection 
This failed if the build metadata contained a period, as in v1.23.0-rc.0

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 247298a20d)
 2021-12-22 12:41:36 -08:00
Brad Davidson c889dedadf More codespell ignores 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 6872e7da25)
 2021-12-22 12:41:36 -08:00
Brad Davidson b38ef3a6aa Close etcd clients to avoid leaking GRPC connections 
If you don't explicitly close the etcd client when you're done with it,
the GRPC connection hangs around in the background. Normally this is
harmelss, but in the case of the temporary etcd we start up on 2399 to
reconcile bootstrap data, the client will start logging errors
afterwards when the server goes away.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 8ad7d141e8)
 2021-12-22 12:41:36 -08:00
Brad Davidson c390292d12 Build script cleanups 
* Move runc and k3s-root versions into versions.sh
* Remove commented-out cruft from build script
* Other minor tweaks

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 8737e2e13f)
 2021-12-22 12:41:36 -08:00
Brad Davidson 5e74eb1068 Bump k3s-root to v0.10.1 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 89e63972e9)
 2021-12-22 12:41:36 -08:00
Brad Davidson cf3e02acea Fix panic checking name of uninitialized etcd member 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-12-21 23:39:03 -08:00
Brian Downs 5b0c1661f1
Update bootstrap logic to output all changed files on disk (#4800) (#4810) 
Signed-off-by: Brian Downs <brian.downs@gmail.com>
 2021-12-21 16:22:23 -07:00
Hussein Galal bcd63e54dd
[Engine-1.21] Close agentReady channel only in k3s (#4795) 
* Close agentReady channel only in k3s

Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>

* codespell check

Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
 2021-12-21 20:28:57 +02:00
Manuel Buil 7e79ba7afd
Merge pull request #4774 from manuelbuil/fix-rke2-ha-engine 
[k3s-engine] Remove Disables, Skips and DisableKubeProxy from the critical configs
 2021-12-17 19:10:24 +01:00
Manuel Buil 5d673f4cdd Remove Disables, Skips and DisableKubeProxy from the comparing configs 
Signed-off-by: Manuel Buil <mbuil@suse.com>
 2021-12-17 18:24:24 +01:00
Hussein Galal bc03b6cf22
[Engine-1.21] Update to v1.21.8 (#4766) 
* Update to v1.21.8

Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>

* Ignore go.mod and go.sum in codespell

Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
 2021-12-16 21:38:05 +02:00
Derek Nola 962113d4a0
[Engine-1.21] Fix cold boot and reconcilation on secondary servers (#4754) 
* Fix cold boot restarts on secondary servers

Signed-off-by: Derek Nola <derek.nola@suse.com>
 2021-12-15 16:12:07 -08:00
Brian Downs e1ab7c3a53
Merge pull request #4736 from briandowns/backport_issue-4644-engine-1.21 
Resolve Bootstrap Migration Edge Case (#4730)
 2021-12-14 08:31:26 -07:00
Hussein Galal 9b67692414 Fix snapshot restoration on fresh nodes (#4737) 
Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
Signed-off-by: Brian Downs <brian.downs@gmail.com>
 2021-12-13 18:14:38 -07:00
Brian Downs bc84ded38c Resolve Bootstrap Migration Edge Case (#4730) 
Signed-off-by: Brian Downs <brian.downs@gmail.com>
 2021-12-13 13:09:28 -07:00
Brian Downs 50b358048b
Resolve restore bootstrap (#4704) (#4717) 2021-12-09 17:54:43 -07:00
Brad Davidson c7e4790aa6 Update wharfie usage in windows code path 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-12-09 13:25:16 -08:00
Brad Davidson fd4e8c97cf Bump runc to v1.0.3 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-12-08 18:44:27 -08:00
Hussein Galal 572ef9cb90
Add validation to certificate rotation (#4699) 
Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
 2021-12-09 02:45:56 +02:00
Brad Davidson 1d9e78ae9c Bump wharfie to v0.5.1 and use shared decompression code 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 7d3447ceff)
 2021-12-08 13:33:23 -08:00
Brad Davidson 1dd9b7d743 bump kine to v0.6.5 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-12-08 13:33:23 -08:00
Alexey Medvedchikov bee0e661b1 Include node-external-ip in serving-kubelet.crt SANs (#4620) 
* Include node-external-ip in serving-kubelet.crt SANs

Signed-off-by: Alexey Medvedchikov <alexeymedvedchikov@improbable.io>
(cherry picked from commit 8f389ab030)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-12-08 10:49:24 -08:00
Manuel Buil ff9d8db944
Merge pull request #4681 from manuelbuil/ha-verify-engine 
[k3s-engine] Verify new control plane nodes joining the cluster share the same config as cluster members
 2021-12-08 16:52:56 +01:00
Manuel Buil b6e176f6a0 Check HA network parameters 
Signed-off-by: Manuel Buil <mbuil@suse.com>
 2021-12-08 14:42:20 +01:00
Derek Nola e7fe71ea1e
[Engine-1.21] Secrets-encryption rotation (#4656) 
* Backport secrets encrypt rotation
* Backport integration fixes for custom etcd args

Signed-off-by: Derek Nola <derek.nola@suse.com>
 2021-12-07 21:55:00 -08:00
Hussein Galal 5153c527eb
[Engine-1.21] Add cert rotation command (#4634) 
* Add cert rotation command (#4495)

* Add cert rotation command

Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>

* add function to check for dynamic listener file

Signed-off-by: Brian Downs <brian.downs@gmail.com>

* Add dynamiclistener cert rotation support

Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>

* fixes to the cert rotation

Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>

* fix ci tests

Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>

* fixes to certificate rotation command

Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>

* more fixes

Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>

Co-authored-by: Brian Downs <brian.downs@gmail.com>

* Upgrade dynamic listener

Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>

Co-authored-by: Brian Downs <brian.downs@gmail.com>
 2021-12-06 19:44:28 +02:00
Derek Nola 9efdec3287
[Engine-1.21] Expose default parser (#4613) 
* Changed to exposing the default parser

Signed-off-by: Derek Nola <derek.nola@suse.com>
 2021-12-01 11:25:42 -08:00
Derek Nola bd9fca62d1
Improved cleanup for etcd unit test (#4537) (#4609) 
* Improved cleanup for etcd unit test

Signed-off-by: Derek Nola <derek.nola@suse.com>
 2021-11-30 11:05:09 -08:00
Chris Kim 4e3a074c11
[engine-1.21] etcd snapshot functionality enhancements (#4607) 
* etcd snapshot functionality enhancements (#4453)

Signed-off-by: Chris Kim <oats87g@gmail.com>

* feat: add option to disable s3 over https

Signed-off-by: Chris Kim <oats87g@gmail.com>

Co-authored-by: Devin Buhl <devin.kray@gmail.com>
 2021-11-29 13:30:12 -08:00
Chris Kim 042628baa1
[engine-1.21] Bump golang and containerd versions (#4540) 
* Bump containerd to v1.4.12-k3s1
* Bump golang to 1.16.10 and sonobuoy to 0.55.0
* Change timeout to 60m

Signed-off-by: Chris Kim <oats87g@gmail.com>
 2021-11-18 21:15:30 -08:00
Chris Kim 0e67d96aea
[engine-1.21] Bump Kubernetes to v1.21.7-k3s1 (#4533) 
* Update to v1.21.7

Signed-off-by: Chris Kim <oats87g@gmail.com>
 2021-11-18 13:11:53 -08:00
Hussein Galal 006b753a62
Fix regression with cluster reset (#4525) 
Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
 2021-11-18 00:08:04 +02:00
Derek Nola 404f6f94ad
Improved regex for double equals arguments (#4506) 
Signed-off-by: Derek Nola <derek.nola@suse.com>
 2021-11-16 12:40:40 -08:00
Derek Nola 6e4cc7c29f
[Engine-1.21] Removed value in warning about skipping flags (#4494) 
* Remove skip warning
* Add warning back in but without value

Signed-off-by: Derek Nola <derek.nola@suse.com>
 2021-11-15 13:20:02 -07:00
Derek Nola d5a4147762
[Engine-1.21] Parser improvements, allow config values to be used with etcd-snapshot (#4477) 
* Match to last After keyword for parser (#4383)
* Made parser able to skip over subcommands
* Fix to allow etcd-snapshot to use config file with flags that are only used with k3s server. (#4464)

Signed-off-by: Derek Nola <derek.nola@suse.com>
 2021-11-11 22:18:10 -08:00
Chris Kim 381d086cf0
[engine-1.21] Add etcd extra args support for K3s (#4470) 
* Add etcd extra args support for K3s

Signed-off-by: Chris Kim <oats87g@gmail.com>

* Add etcd custom argument integration test

Signed-off-by: Chris Kim <oats87g@gmail.com>

* Redux: Enable K3s integration test to run on existing cluster (#3905)

* Made it possible to run int tests on existing cluster

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

Signed-off-by: Chris Kim <oats87g@gmail.com>

Co-authored-by: Derek Nola <derek.nola@suse.com>
 2021-11-11 19:53:20 -08:00
Brad Davidson 8f82ae0749
Increase agent's apiserver ready timeout (#4456) 
Since we now start the server's agent sooner and in the background, we
may need to wait longer than 30 seconds for the apiserver to become
ready on downstream projects such as RKE2.

Since this essentially just serves as an analogue for the server's
apiReady channel, there's little danger in setting it to something
relatively high.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-11-11 14:03:30 -07:00
Brad Davidson 8baa74156b Bump klog fork version 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-11-10 15:33:37 -08:00
Brad Davidson 718d095ee7 Pass context into all Executor functions 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 199424b608)
 2021-11-10 15:33:37 -08:00
Brad Davidson 7364fe8cc6 Replace klog with non-exiting fork 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 29c8b238e5)
 2021-11-10 15:33:37 -08:00
Brian Downs 30c7723c03
[Engine-1.21] All bootstrap backport (#4451) 
Add ability to reconcile bootstrap data between datastore and disk (#3398)
 2021-11-10 16:20:33 -07:00
Luther Monson 67d079ec3a
[engine-1.21] updating to new signals package in wrangler (#4434) 
* updating to new signals package in wrangler

Signed-off-by: Luther Monson <luther.monson@gmail.com>
 2021-11-09 11:16:30 -07:00
Luther Monson 14cf963225
Update wrangler to v0.8.5 (#4428) 
Required to support apiextensions.v1 as v1beta1 has been deleted. Also
update helm-controller and dynamiclistener to track wrangler versions.

Signed-off-by: Luther Monson <luther.monson@gmail.com>

Co-authored-by: Brad Davidson <brad.davidson@rancher.com>
 2021-11-08 19:59:46 -07:00
Brad Davidson 07ee5ec761 Fix log/reap reexec 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-11-01 14:58:58 -07:00
Brad Davidson 4a9a216232 Fix other uses of NewForConfigOrDie in contexts where we could return err 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 3da1bb3af2)
 2021-10-29 16:43:58 -07:00
Brad Davidson c73aaf839b Watch the local Node object instead of get/sleep looping 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 5acd0b9008)
 2021-10-29 16:43:58 -07:00
Brad Davidson 44a5978135 Block scheduler startup on untainted node when using embedded CCM 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 3fe460d080)
 2021-10-29 16:43:58 -07:00
Hussein Galal 998e2bb5fa
Update to v1.21.6 (#4355) 
Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
 2021-10-29 20:00:14 +02:00