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

1990 Commits (06fad1b0b7087478c9da593e09102a3ac2d1bae5)

Author SHA1 Message Date
Manuel Buil 8ea26cdad1 Check HA network parameters 
Signed-off-by: Manuel Buil <mbuil@suse.com>
 2021-12-08 12:50:24 +01:00
Derek Nola 1055837e4f
Backport secrets-encrypte command (#4658) 
Signed-off-by: Derek Nola <derek.nola@suse.com>
 2021-12-07 17:21:10 -08:00
Hussein Galal 7b62900836
[Release-1.21] Add cert rotation command (#4632) 
* 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>

* go mod tidy

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

Co-authored-by: Brian Downs <brian.downs@gmail.com>
 2021-12-06 19:45:21 +02:00
Manuel Buil 378201a459
Merge pull request #4616 from manuelbuil/loggingFlannel1.21 
[Release 1.21] Improve flannel logging
 2021-12-02 19:19:27 +01:00
Manuel Buil 1390792919 Improve flannel logging 
Signed-off-by: Manuel Buil <mbuil@suse.com>
 2021-12-01 18:46:07 +01:00
Chris Kim a622dd57f3
[release-1.21] etcd snapshot functionality enhancements (#4606) 
* 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>

* Prevent snapshot commands from creating empty snapshot directory (#3783)

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

Co-authored-by: Devin Buhl <devin.kray@gmail.com>
Co-authored-by: Derek Nola <derek.nola@suse.com>
 2021-11-29 13:30:00 -08:00
Brad Davidson ac70570999 go generate 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-11-23 16:39:31 -08:00
Brad Davidson 3f40742363 Add package version to traefik helm chart 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-11-23 16:39:31 -08:00
Chris Kim d09821c2ed
[release-1.21] Bump golang and containerd versions (#4539) 
* 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:16 -08:00
Chris Kim 7f737097bc
[release-1.21] Bump Kubernetes to v1.21.7-k3s1 (#4531) 
* Update to v1.21.7

Signed-off-by: Chris Kim <oats87g@gmail.com>
 2021-11-18 11:39:33 -08:00
Hussein Galal 1847a711e7
Fix regression with cluster reset (#4524) 
Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
 2021-11-18 19:21:52 +02:00
Manuel Buil 5b456972c3
Merge pull request #4519 from manuelbuil/backport_ipv6_rh_121 
[Release 1.21] Allow svclb pod to enable ipv6 forwarding
 2021-11-17 20:34:44 +01:00
Manuel Buil fd71ed9f4a Allow svclb pod to enable ipv6 forwarding 
Signed-off-by: Manuel Buil <mbuil@suse.com>
 2021-11-17 19:50:00 +01:00
Manuel Buil c096668cde
Merge pull request #4515 from manuelbuil/fix_dualStack 
[Release 1.21] Backport new cniplugins and klipper-lb image version
 2021-11-17 18:15:31 +01:00
Manuel Buil 43e15c4028 Backport updating cniplugins version and klipper-lb images 
Signed-off-by: Manuel Buil <mbuil@suse.com>
 2021-11-17 12:27:51 +01:00
Manuel Buil 256f5d504a
Merge pull request #4513 from manuelbuil/backport_dual-stack 
[Release 1.21] Backport dual stack
 2021-11-17 08:36:42 +01:00
Derek Nola 88e77fdbfd
Improved regex for double equals arguments (#4508) 
Signed-off-by: Derek Nola <derek.nola@suse.com>
 2021-11-16 11:31:46 -08:00
Manuel Buil e777b2c767 Dual-stack support LB controller 
Signed-off-by: Manuel Buil <mbuil@suse.com>
 2021-11-16 18:50:41 +01:00
Manuel Buil 6854470a14
Merge pull request #4503 from manuelbuil/fix_dualStack_bug 
[Release 1.21] Fix bug in dual-stack
 2021-11-16 10:30:04 +01:00
Manuel Buil 7de34a0059 Fix bug in dual-stack 
We forgot to remove the check to allow dual-stack and flannel

Signed-off-by: Manuel Buil <mbuil@suse.com>
 2021-11-16 09:11:56 +01:00
Derek Nola 93cf545ab2
[Release-1.21] Removed warning about skipping flags (#4493) 
* Remove skip warning
* Add warning back in without value

Signed-off-by: Derek Nola <derek.nola@suse.com>
 2021-11-15 13:19:26 -07:00
Derek Nola 119b1aeb25
[Release-1.21] etcd-snapshot loading config fails with "flag provided but not defined" (#4482) 
* Match to last After keyword for parser (#4383)
* 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-12 11:10:37 -08:00
Chris Kim 334eae119a
[release-1.21] Add etcd extra args support for K3s (#4471) 
* 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>

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

* Add etcd extra args support for K3s

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

* Remove integration test

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

Co-authored-by: Hussein Galal <galal-hussein@users.noreply.github.com>
 2021-11-11 20:36:17 -08:00
Brad Davidson 10c854c00e
Increase agent's apiserver ready timeout (#4457) 
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:44 -07:00
Brad Davidson c9d4543c99 go generate 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-11-10 17:36:35 -08:00
Brad Davidson 7d5d1dbb80 Add dashboard annotations to Traefik helm chart 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-11-10 17:36:35 -08:00
Brian Downs 864e800896
[Release-1.21] All bootstrap backport (#4452) 
Add ability to reconcile bootstrap data between datastore and disk (#3398)
 2021-11-10 16:20:46 -07:00
Brad Davidson df033fa248 Fix log/reap reexec 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-11-01 14:59:08 -07:00
Brad Davidson 254d2f696e 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:47 -07:00
Brad Davidson 388963440d 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:47 -07:00
Brad Davidson afa1981f1d 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:47 -07:00
Hussein Galal 3fba7c1021
Update to v1.21.6 (#4350) 
* Update to v1.21.6

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

* Ignore go.mod and go.sum for codespell

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

* Update to v1.21.6

Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
 2021-10-28 22:38:40 +02:00
Brad Davidson bb50c45a6f Revert "Backport bootstrap release 1.21 (#4313)" 
This reverts commit
f0ea0a0946

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-10-27 14:17:22 -07:00
galal-hussein d413f97146 Update peer address when running cluster-reset 
Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
 2021-10-25 15:45:51 -07:00
Brian Downs f0ea0a0946
Backport bootstrap release 1.21 (#4313) 2021-10-25 13:03:21 -07:00
Brad Davidson 63bcc307fb Bump klipper-helm version 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-10-22 15:05:40 -07:00
Derek Nola 50fb1ce065
Added configuration input to etcd-snapshot (#4280) (#4282) 
Signed-off-by: dereknola <derek.nola@suse.com>
 2021-10-22 13:08:22 -07:00
Manuel Buil 944ea312be
Merge pull request #4267 from manuelbuil/1.21-flannel-update 
[Release-1.21] Update to the newest flannel
 2021-10-21 19:42:16 +02:00
Manuel Buil 11dce34b4e Update to the newest flannel 
Fixes issues such as the internode connectivity

Signed-off-by: Manuel Buil <mbuil@suse.com>
 2021-10-21 13:02:18 +02:00
Manuel Buil 41b0997e31 Add dual-stack support 
Signed-off-by: Manuel Buil <mbuil@suse.com>
 2021-10-21 10:29:03 +02:00
Brad Davidson a18c2efb4c 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 14:36:54 -07:00
Brad Davidson 504e249a5e 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 11:06:12 -07:00
Brad Davidson e814850eef 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 11:06:12 -07:00
Brad Davidson 7cbdea6bd2 go mod tidy 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 699ea16523)
 2021-10-20 11:06:12 -07:00
Brad Davidson 557d425010 Minor cleanup on cribbed function 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 57377d2cd4)
 2021-10-20 11:06:12 -07:00
Brad Davidson 4f28561e34 Wait for apiserver readyz instead of healthz 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 3449d5b9f9)
 2021-10-20 11:06:12 -07:00
Manuel Buil 17f1aa36e2
Merge pull request #4251 from manuelbuil/1.21-race-fix 
[Release-1.21] Race fix in cloud provider
 2021-10-19 17:37:16 +02:00
Manuel Buil 89f5721a3a Fix race condition in cloud provider 
Signed-off-by: Manuel Buil <mbuil@suse.com>
 2021-10-19 10:25:34 +02:00
Brian Downs 4aa9553978
[Release-1.21] - Add etcd s3 timeout (#4207) (#4228) 2021-10-18 10:45:38 -07:00
Hussein Galal 22f7f1c41a
Make sure there are no duplicates in etcd member list (#4025) (#4213) 
* 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-14 23:39:24 +02:00