Commit Graph

1573 Commits (524681fca6d3af262822523751c430f72b2b4508)

Author SHA1 Message Date
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
MonzElmasry 7d8b09c4f8
change etcd dir permission if it exists
Signed-off-by: MonzElmasry <menna.elmasry@rancher.com>
2021-01-14 23:18:19 +02:00
Brad Davidson 5a00e38db4 Update Kubernetes to v1.19.7-k3s1
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2021-01-13 22:04:35 -08:00
Brad Davidson 440bf17523 Update stable charts URL
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2020-12-21 17:22:37 -08:00
Brad Davidson e98fb4fb0f Expose failure if Traefik helm chart cannot be downloaded
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2020-12-21 17:22:37 -08:00
Brad Davidson 746cf40313 Revert "Bump coredns to 1.7.1"
This reverts commit 5753d477df.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2020-12-17 15:23:06 -08:00
Brian Downs b11612e274
Update to v1.19.5 (#2672)
* Update to v1.19.5
2020-12-10 15:56:42 -07:00
Jacob Blain Christen d757e66cd5
fix the k3s-upgrade dispatch (#2679) (#2680)
Signed-off-by: Jacob Blain Christen <jacob@rancher.com>
2020-12-10 14:40:13 -07:00
Chris Kim d34aab4a23
Merge pull request #2675 from Oats87/issues/k3s/2548-119-suppl2
[Backport 1.19] Set kubelet-cgroups if we detect we are running under a `.scope`
2020-12-09 17:34:47 -08:00
Chris Kim 4acdb057a4 use version.Program
Signed-off-by: Chris Kim <oats87g@gmail.com>
2020-12-09 16:44:36 -08:00
Chris Kim b03ddade8e Simplify checkCgroups function call
Co-authored-by: Brian Downs <brian.downs@gmail.com>
2020-12-09 16:44:32 -08:00
Chris Kim 81256683c1 Independently set kubelet-cgroups and runtime-cgroups, and detect if we are running under a systemd scope
Signed-off-by: Chris Kim <oats87g@gmail.com>
2020-12-09 16:44:27 -08:00
Hussein Galal 59c7e8392c
update etcd to fix the panic for etcd tombstone issue (#2658) (#2667)
* update etcd

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>
2020-12-09 22:30:33 +02:00
Brad Davidson 5753d477df Bump coredns to 1.7.1
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2020-12-09 02:00:48 -08:00
Chris Kim c324aa86b4
Merge pull request #2655 from Oats87/issues/k3s/2548-119-suppl
[Backport 1.19] Add check for `/init.scope` for cgroup
2020-12-08 14:14:58 -08:00
Erik Wilson d2fac7b4e7
Merge pull request #2651 from erikwilson/release-1.19
[Release-1.19] Test script cleanup backport from RKE2
2020-12-08 11:45:07 -07:00
Chris Kim c399f87af1 Handle the case when systemd lives under `/init.scope`
Signed-off-by: Chris Kim <oats87g@gmail.com>
2020-12-08 10:37:57 -08:00
Erik Wilson 9885ade11e Test script cleanup backport from RKE2
Signed-off-by: Erik Wilson <Erik.E.Wilson@gmail.com>
2020-12-08 10:48:58 -07:00
Chris Kim 6196098f81
Merge pull request #2646 from Oats87/issues/k3s/2548-1-19
[Backport 1.19] Set a cgroup if containerized
2020-12-08 09:38:35 -08:00
Chris Kim 0ecec4424f When there is a defined cgroup for PID 1, assume we are containerized and set a root
Signed-off-by: Chris Kim <oats87g@gmail.com>
2020-12-07 13:16:08 -08:00
Brian Downs 8f9e5628c1
[release-1.19] go 1.15.5 (#2620)
* update Go to 1.15.5

Signed-off-by: Brian Downs <brian.downs@gmail.com>
2020-12-04 17:04:10 -07:00
Jacob Blain Christen 4a8915348b
[release-1.19] containerd: v1.4.3-k3s1 (#2628)
Signed-off-by: Jacob Blain Christen <jacob@rancher.com>
2020-12-04 14:49:19 -07:00
Jacob Blain Christen 4eba6a7201
[migration k3s-io][release-1.19] drone: initial move to k3s-io (#2610)
Signed-off-by: Jacob Blain Christen <jacob@rancher.com>
2020-12-04 14:10:27 -07:00