public/k3s
1
0
Fork 0
mirror of https://git.vectorsigma.ru/public/k3s.git synced 2026-08-07 20:09:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,189 Commits 31 Branches 949 Tags
7168f7282cd6cd56874e195b9fcb8ec00c4e1139
Commit Graph

97 Commits

Author SHA1 Message Date
Derek Nola
0663681a3d Replace rancher with k3s-io (#5585) 
Signed-off-by: Derek Nola <derek.nola@suse.com>
 2022-05-19 15:54:21 -07:00
Brad Davidson
8b0b50a5e8 [release-1.22] Fix issue with datastore corruption on cluster-reset (#5517) 
* Bump etcd to v3.5.4-k3s1
* Fix issue with datastore corruption on cluster-reset
* Disable unnecessary components during cluster reset

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2022-04-27 15:11:41 -07:00
Roberto Bonafiglia
27264a45cb Fixed included modules 
Signed-off-by: Roberto Bonafiglia <roberto.bonafiglia@suse.com>
 2022-04-05 11:05:18 +02:00
Roberto Bonafiglia
ba0270c6bc Fixed loadbalancer in case of IPv6 addresses 
Signed-off-by: Roberto Bonafiglia <roberto.bonafiglia@suse.com>
 2022-04-05 10:22:34 +02:00
Roberto Bonafiglia
a8fdf93e15 Updated localhost address on IPv6 only setup 
Signed-off-by: Roberto Bonafiglia <roberto.bonafiglia@suse.com>
 2022-04-05 10:18:58 +02:00
Brad Davidson
4cc9a48c1b Defragment etcd datastore before clearing alarms 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2022-03-28 09:28:13 -07:00
Brad Davidson
3d3a4d08ca Ignore cluster membership errors when reconciling from temp etcd 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 9a48086524)
 2022-03-15 18:08:33 -07:00
Brad Davidson
83d858a169 Move temporary etcd startup into etcd module 
Reuse the existing etcd library code to start up the temporary etcd
server for bootstrap reconcile. This allows us to do proper
health-checking of the datastore on startup, including handling of
alarms.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit e4846c92b4)
 2022-03-15 18:08:33 -07:00
Brad Davidson
5cb6b1ecbc Fix adding etcd-only node to existing cluster 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 5014c9e0e8)
 2022-03-15 18:08:33 -07:00
Brad Davidson
1da571ff69 Remove unnecessary copies of etcdconfig struct 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit a1b800f0bf)
 2022-03-15 18:08:33 -07:00
Brad Davidson
9d1240577f Fix cluster bootstrap test 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 54bb65064e)
 2022-03-15 18:08:33 -07:00
Brad Davidson
ce890d626d Remove unnecessary copies of runtime struct 
Several types contained redundant references to ControlRuntime data. Switch to consistently accessing this via config.Runtime instead.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 2989b8b2c5)
 2022-03-15 18:08:33 -07:00
Derek Nola
b3b44aec2f Populate EtcdConfig in runtime from datastore when etcd is disabled (#5222) (#5228) 
Fixes issue with secrets-encrypt rotate not having any etcd endpoints
available on nodes without a local etcd server.

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

Co-authored-by: Brad Davidson <brad.davidson@rancher.com>
 2022-03-08 10:42:23 -08:00
Brad Davidson
ea984d265d Fix handling of agent-token fallback to token 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2022-01-07 09:57:18 -08:00
Brad Davidson
34ba028da5 Fix use of agent creds for secrets-encrypt and config validate 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2022-01-06 13:11:25 -08:00
Brad Davidson
56e3b66b21 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 00:01:27 -08:00
Brian Downs
8ab9a28edc Update bootstrap logic to output all changed files on disk (#4800) (#4809) 
Signed-off-by: Brian Downs <brian.downs@gmail.com>
 2021-12-21 16:22:20 -07:00
Derek Nola
80577a1bd2 [Release-1.22] Fix cold boot and reconcilation on secondary servers (#4755) 
* Fix cold boot restarts of secondary servers

Signed-off-by: Derek Nola <derek.nola@suse.com>
 2021-12-15 15:45:25 -08:00
Hussein Galal
9400af4004 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:18 -07:00
Brian Downs
7808ff9674 Resolve Bootstrap Migration Edge Case (#4730) 
Signed-off-by: Brian Downs <brian.downs@gmail.com>
 2021-12-13 13:03:57 -07:00
Brian Downs
d64a8da871 Resolve restore bootstrap (#4704) (#4715) 2021-12-09 17:54:34 -07:00
Manuel Buil
3d16d94b39 Check HA network parameters 
Signed-off-by: Manuel Buil <mbuil@suse.com>
 2021-12-08 11:00:54 +01:00
Derek Nola
2561285e8e Backport of https://github.com/k3s-io/k3s/pull/4372 (#4654) 
Signed-off-by: Derek Nola <derek.nola@suse.com>
 2021-12-07 15:29:31 -08:00
Hussein Galal
2dc4e2c3a0 Add cert rotation command (#4495) (#4635) 
* 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>

Co-authored-by: Brian Downs <brian.downs@gmail.com>
 2021-12-06 20:53:29 +02:00
Chris Kim
fdb335d7d8 etcd snapshot functionality enhancements (#4453) (#4605) 
Signed-off-by: Chris Kim <oats87g@gmail.com>
 2021-11-29 13:29:51 -08:00
Chris Kim
a1f490df9c [release-1.22] Add etcd extra args support for K3s (#4469) 
* 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>
 2021-11-11 20:22:12 -08:00
Brian Downs
97f494a24d [Release-1.22] All bootstrap backport (#4448) 
Add ability to reconcile bootstrap data between datastore and disk (#3398)
 2021-11-10 16:20:20 -07:00
Derek Nola
586ed948dd Improve error message when using a "K10" prefixed token (#4180) (#4430) 
* Add new error message with a K10 prefixed secret token

Signed-off-by: dereknola <derek.nola@suse.com>
 2021-11-09 08:12:27 -08:00
Brad Davidson
46eea2f10a Revert "Add ability to reconcile bootstrap data between datastore and disk (#3398)" 
This reverts commits
9a4ca5978b
c9f6fa0be0
07f844cf95
48355dce10

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-10-27 14:17:12 -07:00
Brian Downs
9a4ca5978b reset buffer after use (#4279) (#4329) 2021-10-26 17:58:25 -07:00
Brian Downs
07f844cf95 Copy old bootstrap buffer data for use during migration (#4215) 
Signed-off-by: Brian Downs <brian.downs@gmail.com>
 2021-10-25 16:23:31 -07:00
Brian Downs
48355dce10 Add ability to reconcile bootstrap data between datastore and disk (#3398) 
Signed-off-by: Brian Downs <brian.downs@gmail.com>
 2021-10-25 16:23:31 -07:00
Hussein Galal
6193b1af97 Display cluster tls error only in debug mode (#4200) 
Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
 2021-10-13 01:48:00 +02:00
Brad Davidson
29c8b238e5 Replace klog with non-exiting fork 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-09-10 09:36:16 -07:00
Brad Davidson
cf12a13175 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:22:32 -07:00
Brad Davidson
b8add39b07 Bump kine for metrics/tls changes 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-09-01 01:51:30 -07:00
Brad Davidson
dc14f370c4 Update wrangler to v0.8.5 
Required to support apiextensions.v1 as v1beta1 has been deleted. Also
update helm-controller and dynamiclistener to track wrangler versions.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-08-20 18:47:16 -07:00
galal-hussein
20a48734c2 more fixes 
Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
 2021-07-21 22:42:05 +02:00
galal-hussein
7ebcc4b134 more fixes 
Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
 2021-07-21 22:39:44 +02:00
galal-hussein
b4401296ec replace error with warn in delete 
Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
 2021-07-21 22:18:56 +02:00
galal-hussein
2f82bfcf67 fix warning msg 
Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
 2021-07-21 22:05:43 +02:00
galal-hussein
b377839148 migrate old token key format 
Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
 2021-07-21 20:59:57 +02:00
galal-hussein
997ed7b9b4 simplifying the code 
Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
 2021-07-21 19:56:19 +02:00
galal-hussein
ad17292fa8 migrate empty string key properly 
Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
 2021-07-21 19:21:38 +02:00
galal-hussein
a65e5b6466 Fix multiple bootstrap keys found 
Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
 2021-07-21 02:50:42 +02:00
Hussein Galal
a939decf01 fix a runtime core panic (#3627) 
Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
 2021-07-13 23:33:07 +02:00
Brian Downs
238dc2086e prevent snapshot save when snapshots are disabled (#3475) 
* prevent snapshot save when snapshots are disabled
 2021-07-09 10:22:49 -07:00
Brad Davidson
cbfe673c43 Fix spelling to satisfy codespell check 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-07-01 13:29:03 -07:00
Brad Davidson
246b378a27 Bump kine to resolve race condition and unrevisioned delete 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-06-30 09:54:46 -07:00
Hussein Galal
136dddca11 Fix storing bootstrap data with empty token string (#3422) 
* Fix storing bootstrap data with empty token string

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

* delete node password secret after restoration

fixes to bootstrap key

vendor update

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

* fix comment

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

* fix typo

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

* more fixes

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

* fixes

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

* fixes

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

* typos

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

* Removing dynamic listener file after restoration

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

* go mod tidy

Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
 2021-06-22 22:42:34 +02:00