public/k3s
1
0
Fork 0
mirror of https://git.vectorsigma.ru/public/k3s.git synced 2026-08-06 13:50:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,963 Commits 31 Branches 949 Tags
e7fe71ea1eca6a4e461aed1768c3af44592f4983
Commit Graph

767 Commits

Author SHA1 Message Date
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
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
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
Brad Davidson
7d0ecf3ab2 Revert "Backport bootstrap engine 1.21 (#4314)" 
This reverts commits
c5a9154538
45c5d78cd7

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-10-27 13:46:00 -07:00
Brian Downs
c5a9154538 reset buffer after use (#4279) (#4330) 2021-10-26 17:58:19 -07:00
galal-hussein
174b3881a2 Update peer address when running cluster-reset 
Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
 2021-10-25 15:44:18 -07:00
Brian Downs
45c5d78cd7 Backport bootstrap engine 1.21 (#4314) 2021-10-25 13:03:30 -07:00
Derek Nola
ee64caceb8 Added configuration input to etcd-snapshot (#4280) (#4287) 
Signed-off-by: dereknola <derek.nola@suse.com>
 2021-10-22 16:52:48 -07:00
Brad Davidson
bfc22ca613 Refactor log and reaper exec to omit MAINPID 
Using MAINPID breaks systemd's exit detection, as it stops watching the
original pid, but is unable to watch the new pid as it is not a child
of systemd itself. The best we can do is just notify when execing the child
process.

We also need to consolidate forking into a sigle place so that we don't
end up with multiple levels of child processes if both redirecting log
output and reaping child processes.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit dc18ef2e51)
 2021-10-20 13:09:15 -07:00
Brad Davidson
1a8bd3156f Add containerd ready channel to delay etcd node join 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 88178ae65e)
 2021-10-20 12:35:16 -07:00
Brad Davidson
edde820e89 Fix premature etcd shutdown when joining an existing cluster 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 086ca8ba6a)
 2021-10-20 12:35:16 -07:00
Brad Davidson
36332c8cfe Pass context in to embedded etcd so that it can be stopped 
Partial cherry-pick from 29c8b238e5

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-10-20 12:35:16 -07:00
Brad Davidson
c1b193ae26 Minor cleanup on cribbed function 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 57377d2cd4)
 2021-10-20 12:35:16 -07:00
Brad Davidson
e8d30101a6 Wait for apiserver readyz instead of healthz 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 3449d5b9f9)
 2021-10-20 12:35:16 -07:00
Manuel Buil
30189d04b7 Fix race condition in cloud provider 
Signed-off-by: Manuel Buil <mbuil@suse.com>
 2021-10-19 10:28:02 +02:00
Brian Downs
697f7e471a [Engine-1.21] - Add etcd s3 timeout (#4207) (#4229) 2021-10-18 10:45:47 -07:00
Hussein Galal
0c3f752620 [engine-1.21] Display cluster tls error only in debug mode (#4125) 
* Display cluster tls error only in debug mode

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

* fix

Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
 2021-10-13 01:13:59 +02:00
Hussein Galal
0c109a58b0 Make sure there are no duplicates in etcd member list (#4025) (#4050) 
* Make sure there are no duplicates in etcd member list

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

* fix node names with hyphens

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

* use full server name for etcd node name

Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
 2021-10-07 22:28:42 +02:00
Brian Downs
1eeffbb330 set transport to skip verify if se skip flag passed (#4102) (#4106) 2021-10-07 12:47:50 -07:00
Derek Nola
9c7e871942 Add "etcd-" prefix to etcd-snapshot commands as aliases (#4161) (#4172) 
* Add "etcd-" prefix to etcd-snapshot commands as alias

Signed-off-by: dereknola <derek.nola@suse.com>
 2021-10-07 09:30:50 -07:00
Brad Davidson
27bebd11a5 Don't evacuate the root cgroup when rootless 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-10-01 16:19:51 -07:00
Brad Davidson
a71a04d57c Properly handle operation as init process 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-09-28 11:34:00 -07:00
Chris Kim
da379fbd19 [engine-1.21] Update to Kubernetes v1.21.5 (#4057) 
* Update to Kubernetes v1.21.5
* Handle moved runc library

Signed-off-by: Chris Kim <oats87g@gmail.com>
 2021-09-21 10:53:24 -07:00
Derek Nola
908ac8efa2 Removed experimental from cluster commands (#4035) 
Signed-off-by: dereknola <derek.nola@suse.com>
 2021-09-16 11:07:35 -07:00
Chris Kim
661b5aeb94 No-op when etcd member was already removed and use existing name for etcd controller (#4016) 
Signed-off-by: Chris Kim <oats87g@gmail.com>
 2021-09-15 07:36:21 -07:00
Chris Kim
34de120875 Initial leader elected etcd member management controller (#4011) 
Signed-off-by: Chris Kim <oats87g@gmail.com>
 2021-09-14 10:19:38 -07:00
Brad Davidson
f2c7882750 Add exposed metrics listener instead of replacing loopback listener 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-09-10 10:59:08 -07:00
Brad Davidson
a6bbc65776 Add missing node name entry to apiserver SAN list 
Also honor node-ip when adding the node address to the SAN list, instead
of hardcoding the autodetected IP address.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-09-01 13:23:07 -07:00
Hussein Galal
841793de01 Fix condition for adding kubernetes endpoints (#3941) (#3951) 
* Fix condition for adding kubernetes endpoints

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

* Fix condition for adding kubernetes endpoints

Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
 2021-09-01 00:03:36 +02:00
Manuel Buil
75d3e27928 Add functions to separate ipv4 from ipv6 functions 
Signed-off-by: Manuel Buil <mbuil@suse.com>
 2021-08-27 19:05:34 +02:00
Derek Nola
ed5991f13b K3s Flock Integration Test (#3887) 
* Upgraded flock with shared and integration test.

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

Co-authored-by: Brian Downs <brian.downs@gmail.com>
 2021-08-20 12:34:22 -07:00
Hussein Galal
e322924781 Reset load balancer state during restoraion (#3877) 
* Reset load balancer state during restoraion

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

* Reset load balancer state during restoraion

Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
 2021-08-18 01:02:30 +02:00
Malte Starostik
b23955e835 Fix URL pruning when joining an etcd member (#3832) 
* Fix URL pruning when joining an etcd member

Problem:
Existing member clientURLs were checked if they contain the joining
node's IP. In some edge cases this would prune valid URLs when the
joining IP is a substring match of the only existing member's IP.
Because of this, it was impossible to e.g. join 10.0.0.2 to an existing
node that has an IP of 10.0.0.2X or 10.0.0.2XX:

level=fatal msg="starting kubernetes: preparing server: start managed database:
joining etcd cluster: etcdclient: no available endpoints"

Solution:
Fixed by properly parsing the URLs and comparing the IPs for equality
instead of substring match.

Signed-off-by: Malte Starostik <info@stellaware.de>
 2021-08-12 15:59:04 -07:00