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

1595 Commits (54dded0797ef33719656505a4591d56c69fa2d86)

Author SHA1 Message Date
Erik Wilson 54dded0797
Bump to go 1.15.12 2021-05-14 10:44:36 -07:00
Erik Wilson d8425402ec
Update Kubernetes to v1.19.11-k3s 2021-05-14 10:25:06 -07:00
Jacob Blain Christen 584ed26f76
[backport 1.19] runc: v1.0.0-rc94 (#3313) 
- bump the runc version to v1.0.0-rc94
- build runc from its own source tree instead of from ./vendor/
  - side-steps incompatibility with upstream kubelet container manager

backport of #3305
addresses #3301

Signed-off-by: Jacob Blain Christen <dweomer5@gmail.com>
 2021-05-13 15:12:49 -07:00
Menna Elmasry 9037cadcb4
Merge pull request #3320 from MonzElmasry/validate-go-mod-ci-1.19 
[release-1.19]Add ci step to validate incorerct replacement fork
 2021-05-13 05:06:52 +02:00
Menna Elmasry 7ab6d5cf19
Merge pull request #3318 from MonzElmasry/disable-apiserver-flag-1.19 
[release-1.19]change --disable-api-server flag to --disable-apiserver
 2021-05-13 01:43:30 +02:00
MonzElmasry d8826c254f
Add ci step to validate incorerct replacement fork 
Signed-off-by: MonzElmasry <menna.elmasry@rancher.com>
 2021-05-13 01:37:50 +02:00
MonzElmasry 519651b653
change --disable-apiserver flag 
Signed-off-by: MonzElmasry <menna.elmasry@rancher.com>
 2021-05-13 00:25:49 +02:00
Menna Elmasry cc825813b6
Merge pull request #3210 from MonzElmasry/fix_ci_1.19 
[backport 1.19] Fix ci flakey tests and image pull registry
 2021-04-16 23:09:56 +02:00
Brad Davidson f14540cc4f
Wait longer for sonobuoy tests to start up 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-04-16 22:24:02 +02:00
Brad Davidson 98756c8c21
Clean up CI warnings/errors 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-04-16 22:24:01 +02:00
Brad Davidson c2c742cf92
resolve conflicts 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-04-16 22:23:37 +02:00
Menna Elmasry 72e8196c9b
Merge pull request #3208 from MonzElmasry/v1.19.10-k3s1 
Update to v1.19.10
 2021-04-16 11:15:24 +02:00
MonzElmasry 4ac7d61696
Update to v1.19.10 
Signed-off-by: MonzElmasry <menna.elmasry@rancher.com>
 2021-04-15 22:17:28 +02:00
MonzElmasry 52c3f32cc4
Update to v1.19.10 
Signed-off-by: MonzElmasry <menna.elmasry@rancher.com>
 2021-04-15 21:12:54 +02:00
Brian Downs f761529953
Merge pull request #3198 from briandowns/backport_3197_1.19 
[Backport 1.19] - Resolve local retention issue when S3 in use.
 2021-04-14 13:42:19 -07:00
Brian Downs 0f3fe02eff Resolve local retention issue when S3 in use. 
Remove early return preventing local retention policy to be enforced
resulting in N number of snapshots being stored.

Signed-off-by: Brian Downs <brian.downs@gmail.com>
 2021-04-14 12:09:45 -07:00
Brian Downs dc1d86e684
Merge pull request #3177 from briandowns/backport_pr_3155 
[Backport 1.19] Hidden Flags Bug Fix
 2021-04-14 09:00:55 -07:00
Brian Downs f9450c84e7
Merge pull request #3182 from briandowns/backport_3180 
[Backport 1.19] - add etcd s3 secret and access key flags to secret data
 2021-04-13 10:01:42 -07:00
Brian Downs e48d4b5425 add etcd s3 secret and access key flags and env vars to secret data 
Signed-off-by: Brian Downs <brian.downs@gmail.com>
 2021-04-12 15:48:53 -07:00
Brian Downs a3dcc9de36 replace unused variable name with bool literal 
Signed-off-by: Brian Downs <brian.downs@gmail.com>
 2021-04-12 12:25:01 -07:00
Brian Downs 7807d8117a delete nocluster file and remove build tag 
Signed-off-by: Brian Downs <brian.downs@gmail.com>
 2021-04-12 11:07:02 -07:00
Brian Downs b6623b916e remove hidden attribute from cluster flags and related code 
Signed-off-by: Brian Downs <brian.downs@gmail.com>
 2021-04-12 11:06:41 -07:00
Brian Downs 524681fca6
Merge pull request #3080 from briandowns/backport_add_etcd_backup_restore_s3 
[release-1.19] Backport add etcd backup restore s3
 2021-04-02 14:34:59 -07:00
Brian Downs 24670c7897 update Go version and parameterize Dockerfile 
Signed-off-by: Brian Downs <brian.downs@gmail.com>
 2021-03-31 11:51:04 -07:00
Brian Downs 5ba818d788 update dependencies 
Signed-off-by: Brian Downs <brian.downs@gmail.com>
 2021-03-31 09:48:43 -07:00
Brian Downs 2b6f5eb228
Merge branch 'release-1.19' into backport_add_etcd_backup_restore_s3 2021-03-31 09:12:45 -07:00
Brian Downs 7854da1ade update go.sum 
Signed-off-by: Brian Downs <brian.downs@gmail.com>
 2021-03-31 09:10:04 -07:00
Brian Downs 6d6354a137 Fix bootstrap save 
Signed-off-by: Brian Downs <brian.downs@gmail.com>
 2021-03-31 08:58:37 -07:00
Brian Downs ce7b0d3f5d update capitalization of usage string 
Signed-off-by: Brian Downs <brian.downs@gmail.com>
 2021-03-30 14:50:12 -07:00
Brian Downs ab54af2883 update go mods 
Signed-off-by: Brian Downs <brian.downs@gmail.com>
 2021-03-30 14:50:12 -07:00
Jacob Blain Christen ac73524a77 Update to Kubernetes v1.19.9 (#3095) 
* Update to Kubernetes v1.19.9

Signed-off-by: Jacob Blain Christen <jacob@rancher.com>
 2021-03-30 14:50:12 -07:00
Jacob Blain Christen 5dc61aad02 [release 1.19] containerd: v1.4.4-k3s1 (#3085) 
Addresses k3s-io/k3s#3068 and CVE-2021-21334

Signed-off-by: Jacob Blain Christen <jacob@rancher.com>
 2021-03-30 14:49:54 -07:00
Hussein Galal bead080d5e
Fix bootstrap save (#3129) 
Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
 2021-03-30 22:02:15 +02:00
Brian Downs cbdad9090b update imports 
Signed-off-by: Brian Downs <brian.downs@gmail.com>
 2021-03-19 13:25:29 -07:00
Brian Downs f82cc79112 update imports for this release branch 
Signed-off-by: Brian Downs <brian.downs@gmail.com>
 2021-03-19 12:13:14 -07:00
Jacob Blain Christen a12976352c
Update to Kubernetes v1.19.9 (#3095) 
* Update to Kubernetes v1.19.9

Signed-off-by: Jacob Blain Christen <jacob@rancher.com>
 2021-03-18 17:19:47 -07:00
Brian Downs 11398ca7f5 put etcd bootstrap save call in goroutine and update comment 
Signed-off-by: Brian Downs <brian.downs@gmail.com>
 2021-03-18 12:56:06 -07:00
Jacob Blain Christen 0209f359fb
[release 1.19] containerd: v1.4.4-k3s1 (#3085) 
Addresses k3s-io/k3s#3068 and CVE-2021-21334

Signed-off-by: Jacob Blain Christen <jacob@rancher.com>
 2021-03-17 14:36:56 -07:00
Brian Downs 7b56aea0c0 Have Bootstrap Data Stored in etcd at Completed Start (#3038) 
* have state stored in etcd at completed start and remove unneeded code

(cherry picked from commit 7c99f8645d)
Signed-off-by: Brian Downs <brian.downs@gmail.com>
 2021-03-15 17:11:31 -07:00
Brian Downs 92d1ecfbbe Etcd Snapshot/Restore to/from S3 Compatible Backends (#2902) 
* Add functionality for etcd snapshot/restore to and from S3 compatible backends.
* Update etcd restore functionality to extract and write certificates and configs from snapshot.

(cherry picked from commit 4d1f9eda9d)
Signed-off-by: Brian Downs <brian.downs@gmail.com>
 2021-03-15 17:02:53 -07:00
Brian Downs ca55efaa8e Add ability to perform an etcd on-demand snapshot via cli (#2819) 
* add ability to perform an etcd on-demand snapshot via cli

(cherry picked from commit 13229019f8)
Signed-off-by: Brian Downs <brian.downs@gmail.com>
 2021-03-15 16:54:41 -07:00
Chris Kim 64017c5272
Define a Controllers and LeaderControllers on the server config (#3052) 
Signed-off-by: Chris Kim <oats87g@gmail.com>
 2021-03-12 07:27:51 -08:00
Hussein Galal f621760825
[release-1.19] Add disable components flags (#3023) 
* Add disable flags for control components (#2900)

* Add disable flags to control components

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

* golint

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 to disable flags

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

* Add comments to functions

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

* Fix joining problem

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

* more fixes

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

* golint

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

* fix ticker

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

* fix role labels

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

* more fixes

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

* update dynamiclistener

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

* remove etcd member if disable etcd is passed

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

* Mark disable components flags as experimental

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

* change error to warn when removing self from etcd members

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

* Add hidden to disable flags

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

* go mod

Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
 2021-03-05 00:28:56 +02:00
Hussein Galal 95fc76b206
Update to v1.19.8 (#2948) 
* Update to v1.19.8

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

* Update to v1.19.8

Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
 2021-02-18 23:22:06 +02:00
Brad Davidson 870f2e5070 Update k3s-root to v0.8.1 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 457daeadd6)
 2021-02-18 09:51:16 -08:00
Brad Davidson e34ffdba56 Bump golang to 1.15.8 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 37db7d11a1)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-02-08 09:55:27 -08:00
Brad Davidson bf84951c8c Update containerd to fix AppArmor on SLES 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-01-29 16:41:23 -08:00
Brad Davidson 16be73afb0 Bump k3s-root to v0.8.0 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-01-29 13:09:30 -08:00
Brad Davidson 4079e460e7 Update helm-controller to v0.8.3 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-01-22 21:58:15 -08:00
Menna Elmasry ec9a05f52d
Merge pull request #2818 from MonzElmasry/etcd-dir-backport 
[release-1.19 ]change etcd dir permission if it exists
 2021-01-15 23:46:04 +02:00