public/k3s
1
0
Fork 0
mirror of https://git.vectorsigma.ru/public/k3s.git synced 2026-07-30 05:49:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,180 Commits 31 Branches 949 Tags
f090bf2d5eb9abc6cd09ed8ff794bb00a9276079
Commit Graph

87 Commits

Author SHA1 Message Date
Brad Davidson
9a48086524 Ignore cluster membership errors when reconciling from temp etcd 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2022-03-01 20:25:20 -08:00
Brad Davidson
e4846c92b4 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>
 2022-03-01 20:25:20 -08:00
Brad Davidson
555087b9b8 Add function to clear local alarms on etcd startup 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2022-03-01 11:56:52 -08:00
Brad Davidson
5014c9e0e8 Fix adding etcd-only node to existing cluster 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2022-02-28 19:56:08 -08:00
Brad Davidson
2989b8b2c5 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>
 2022-02-28 12:05:16 -08:00
Derek Nola
e28be2912c Migrate Ginkgo testing framework to V2, consolidate integration tests (#5097) 
* Upgrade and convert ginkgo from v1 to v2
* Move all integration tests into integration folder
* Update TESTING.md

Signed-off-by: Derek Nola <derek.nola@suse.com>
 2022-02-09 08:22:53 -08:00
Hussein Galal
13728058a4 Add k3s etcd restoration integration test (#5014) 
* Add k3s etcd restoration test

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

* Fix tests and rebase

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

* Reorganizing the tests

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

* Fixing comments

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

* Fix etcd restore

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

* dont check for errors when restoring

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

* use eventually to test for restoration

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

* fix tests

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

* fix golint

Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
 2022-02-08 21:24:34 +02:00
Brian Downs
effcb15adb Adds the ability to compress etcd snapshots (#4866) 2022-01-14 10:31:22 -07:00
Derek Nola
2ac8df3602 Integration tests utilities improvements (#4832) 
* Remove sudo commands from integration tests

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

* Added cleanup fucntion

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

* Implement better int cleanup

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

* Rename test utils

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

* Enable K3sCmd to be a single string

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

* Removed parsePod function

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

* codespell

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

* Revert startup timeout

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

* Reorder sonobuoy tests, drop concurrent tests to 3

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

* Disable etcd

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

* Skip parallel testing for etcd

Signed-off-by: Derek Nola <derek.nola@suse.com>
 2022-01-06 08:05:56 -08:00
Brad Davidson
a5c6e6a68a Fix panic checking name of uninitialized etcd member 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-12-21 23:38:20 -08:00
Hussein Galal
d71b335871 Fix snapshot restoration on fresh nodes (#4737) 
Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
 2021-12-14 02:04:39 +02:00
Brian Downs
a6fe2c0bc5 Resolve restore bootstrap (#4704) 2021-12-09 14:54:27 -07:00
Manuel Buil
1b3187ea07 Check HA network parameters 
Signed-off-by: Manuel Buil <mbuil@suse.com>
 2021-12-07 23:09:05 +01:00
Derek Nola
d05c334a78 Improved cleanup for etcd unit test (#4537) 
* Improved cleanup for etcd unit test

Signed-off-by: Derek Nola <derek.nola@suse.com>
 2021-11-29 14:46:58 -08:00
Chris Kim
ae4a1a144a etcd snapshot functionality enhancements (#4453) 
Signed-off-by: Chris Kim <oats87g@gmail.com>
 2021-11-29 10:30:04 -08:00
Chris Kim
f18b3252c0 [master] Add etcd extra args support for K3s (#4463) 
* 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>

* go generate

Signed-off-by: Chris Kim <oats87g@gmail.com>
 2021-11-11 21:03:15 -08:00
Brian Downs
adaeae351c update bootstrap logic (#4438) 
* update bootstrap logic resolving a startup bug and account for etcd
 2021-11-10 05:33:42 -07:00
Derek Nola
7c3f21e581 K3s Integration test fixes (#4341) 
* Move tests into sub folders
* Updated documentation
* Prevent infinite loop is user has not made k3s

Signed-off-by: dereknola <derek.nola@suse.com>
 2021-10-28 12:35:28 -07:00
galal-hussein
ab3d25a2c5 Update peer address when running cluster-reset 
Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
 2021-10-25 15:43:27 -07:00
Brian Downs
0452f017c1 Add etcd s3 timeout (#4207) 2021-10-15 10:24:14 -07:00
Brad Davidson
5a923ab8dc Add containerd ready channel to delay etcd node join 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-10-14 14:03:52 -07:00
Brian Downs
ac7a8d89c6 Add ability to reconcile bootstrap data between datastore and disk (#3398) 2021-10-07 12:47:00 -07:00
Brian Downs
f4cea90cb9 set transport to skip verify if se skip flag passed (#4102) 2021-09-28 10:13:50 -07:00
Hussein Galal
7826407a2e Make sure there are no duplicates in etcd member list (#4025) 
* 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-09-18 00:51:18 +02:00
Brad Davidson
086ca8ba6a Fix premature etcd shutdown when joining an existing cluster 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-09-15 10:35:07 -07:00
Chris Kim
acf9036b63 No-op when etcd member was already removed and use existing name for etcd controller (#4014) 
Signed-off-by: Chris Kim <oats87g@gmail.com>
 2021-09-15 08:41:30 -07:00
Chris Kim
928b8531c3 [master] Add etcd-member-management controller to K3s (#4001) 
* Initial leader elected etcd member management controller
* Bump etcd to v3.5.0-k3s2

Signed-off-by: Chris Kim <oats87g@gmail.com>
 2021-09-14 08:20:38 -07:00
Brad Davidson
b4d8c641c6 Add exposed metrics listener instead of replacing loopback listener 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-09-10 09:39:39 -07: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
Darren Shepherd
741ba95b04 Migrate sqlite data to etcd when initializing the cluster 
Signed-off-by: Darren Shepherd <darren@rancher.com>
 2021-09-09 10:24:02 -07:00
Devin Buhl
a1ec43e0b7 feat: add option to disable s3 over https 
Signed-off-by: Devin Buhl <devin.kray@gmail.com>
 2021-09-05 12:03:49 -04: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
Derek Nola
60297a1bbe Creation of K3s integration test Sonobuoy plugin (#3931) 
* Added test runner and build files
* Changes to int test to output junit results.
* Updated documentation, removed comments

Signed-off-by: dereknola <derek.nola@suse.com>
 2021-08-30 08:27:59 -07:00
Derek Nola
114b30277f 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>
 2021-08-26 16:26:19 -07:00
Derek Nola
66dacc6ee0 Revert "Enable K3s integration test to run on existing cluster (#3892)" (#3899) 
This reverts commit 703b5af950.
 2021-08-24 07:26:14 -07:00
Derek Nola
703b5af950 Enable K3s integration test to run on existing cluster (#3892) 
* Made it possible to run int tests on existing cluster

Signed-off-by: dereknola <derek.nola@suse.com>
 2021-08-23 12:12:03 -07:00
Brad Davidson
e95b75409a Fix lint failures 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-08-20 18:47:16 -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
Brad Davidson
872855015c Update etcd to v3.5.0 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-08-20 18:47:16 -07: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
Derek Nola
a1e36153f9 Added locking system for integration tests (#3820) 
* Added locking system for integration tests
Signed-off-by: dereknola <derek.nola@suse.com>
 2021-08-10 16:22:12 -07:00
Derek Nola
4cc781b5e3 Moved testing utils into tests directory. Improved gotests template. (#3805) 
* Moved testing utils into tests directory. Improved gotests template.
* Updated cgroups2 with util folder rename

Signed-off-by: dereknola <derek.nola@suse.com>
 2021-08-10 11:13:26 -07:00
Brian Downs
dcf0657b20 account for an s3 folder when listing objects (#3807) 
* account for an s3 folder when listing objects
 2021-08-09 16:14:41 -07:00
Derek Nola
b4eca61aeb Prevent snapshot commands from creating empty snapshot directory (#3783) 
Signed-off-by: dereknola <derek.nola@suse.com>
 2021-08-09 09:04:18 -07:00
Hussein Galal
bc96ffb5f3 Fix Node stuck at deletion (#3771) 
* fix Node stuck at deletion

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

* fix Node stuck at deletion

Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
 2021-08-05 22:32:01 +02:00
Derek Nola
21c8a33647 Introduction of Integration Tests (#3695) 
* Commit of new etcd snapshot integration tests.
* Updated integration github action to not run on doc changes.
* Update Drone runner to only run unit tests

Signed-off-by: dereknola <derek.nola@suse.com>
 2021-07-26 09:59:33 -07:00
Derek Nola
bba49ea447 Fix to allow prune to correctly cleanup custom named snapshots (#3649) 
Signed-off-by: dereknola <derek.nola@suse.com>
 2021-07-19 14:30:57 -07:00
Derek Nola
c833183517 Add unit tests for pkg/etcd (#3549) 
* Created new etcd unit tests and testing support file

Signed-off-by: dereknola <derek.nola@suse.com>
 2021-07-01 16:08:35 -07:00
Hussein Galal
f5fbb9a9a8 Export cli server flags and etcd restoration functions (#3527) 
* Export cli server flags and etfd restoration functions

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

* export S3

Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
 2021-06-30 22:29:03 +02:00
Brian Downs
ecbf17e2ed move object channel defer close to goroutine 
Signed-off-by: Brian Downs <brian.downs@gmail.com>
 2021-05-18 19:58:30 -07:00