public/k3s
1
0
Fork 0
mirror of https://git.vectorsigma.ru/public/k3s.git synced 2026-08-03 02:39:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,712 Commits 31 Branches 949 Tags
62bbef7253ceca7fac3a298fcdf36c32b71a040c
Commit Graph

1712 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Downs
62bbef7253 update struct field doc comment and get basename on s3 obj 
Signed-off-by: Brian Downs <brian.downs@gmail.com>
 2021-06-29 09:51:49 -07:00
Brian Downs
83ae76fe8d update data structure and account for possible race in start 
Signed-off-by: Brian Downs <brian.downs@gmail.com>
 2021-06-29 09:51:42 -07:00
Brian Downs
4c57fad5a1 update doc comment 
Signed-off-by: Brian Downs <brian.downs@gmail.com>
 2021-06-29 09:51:35 -07:00
Brian Downs
297d80a924 remove unnecessary error condition 
Signed-off-by: Brian Downs <brian.downs@gmail.com>
 2021-06-29 09:51:27 -07:00
Brian Downs
4e90846599 add node name to s3 structure data 
Signed-off-by: Brian Downs <brian.downs@gmail.com>
 2021-06-29 09:51:20 -07:00
Brian Downs
a831b8e611 add location comment 
Signed-off-by: Brian Downs <brian.downs@gmail.com>
 2021-06-29 09:51:13 -07:00
Brian Downs
d6378e5901 add addtional log entry 
Signed-off-by: Brian Downs <brian.downs@gmail.com>
 2021-06-29 09:51:06 -07:00
Brian Downs
77caab3c34 update retention 
Signed-off-by: Brian Downs <brian.downs@gmail.com>
 2021-06-29 09:50:58 -07:00
Brian Downs
b3e84c8862 code clean up, simplification, etc. 
Signed-off-by: Brian Downs <brian.downs@gmail.com>
 2021-06-29 09:50:52 -07:00
Brian Downs
a846957a47 update func sig 
Signed-off-by: Brian Downs <brian.downs@gmail.com>
 2021-06-29 09:50:44 -07:00
Brian Downs
9882eb0887 update vendor and config map name 
Signed-off-by: Brian Downs <brian.downs@gmail.com>
 2021-06-29 09:50:30 -07:00
Brian Downs
a6f64cc73d update node name in s3 files 
Signed-off-by: Brian Downs <brian.downs@gmail.com>
 2021-06-29 09:48:54 -07:00
Brian Downs
10f0a7908a add configmap save logic 
Signed-off-by: Brian Downs <brian.downs@gmail.com>
 2021-06-29 09:48:45 -07:00
Brian Downs
977d7923dd Add ability to list snapshots. 
This adds the ability to list snapshots stored locally and in S3 and
their respective metadata.

Signed-off-by: Brian Downs <brian.downs@gmail.com>
 2021-06-29 09:48:38 -07:00
Brian Downs
9833ac095d update dependencies 
Signed-off-by: Brian Downs <brian.downs@gmail.com>
 2021-06-29 09:48:27 -07:00
Derek Nola
5d0a12a616 Update to v1.20.8 (#3477) 
* Update to v1.20.8
* Fix comment typo that was breaking tests
Signed-off-by: root <derek.nola@suse.com>
v1.20.8+k3s1 v1.20.8-rc1+k3s1 		2021-06-17 19:34:10 -07:00
Jacob Blain Christen
aa768cbdab [backport 1.20] runc: v1.0.0-rc95 (#3351) 
- Addresses #3300

Signed-off-by: Jacob Blain Christen <dweomer5@gmail.com>
v1.20.7+k3s1 v1.20.7-rc2+k3s1 		2021-05-19 11:35:03 -07:00
Brad Davidson
245f27e2b2 Handle conntrack-related sysctls in supervisor agent setup 
(cherry picked from commit 7e175e8ad4)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-05-19 01:03:00 -07:00
Erik Wilson
dc12eca456 Merge pull request #3329 from erikwilson/v1.20.7-k3s1 
Update Kubernetes to v1.20.7-k3s1
v1.20.7-rc1+k3s1 		2021-05-14 13:54:37 -07:00
Erik Wilson
f90bce1b83 Bump to go 1.15.12 2021-05-14 10:39:42 -07:00
Erik Wilson
58a8df9011 Update Kubernetes to v1.20.7-k3s1 2021-05-14 10:08:52 -07:00
Jacob Blain Christen
9e67930541 [backport 1.20] runc: v1.0.0-rc94 (#3312) 
- 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 #3300

Signed-off-by: Jacob Blain Christen <dweomer5@gmail.com>
 2021-05-13 15:12:28 -07:00
Menna Elmasry
c988783170 Merge pull request #3321 from MonzElmasry/validate-go-mod-ci-1.20 
[release-1.20]Add ci step to validate incorerct replacement fork
 2021-05-13 05:06:59 +02:00
Menna Elmasry
ec9c0174c3 Merge pull request #3317 from MonzElmasry/disable-apiserver-flag-1.20 
[release-1.20] change --disable-api-server flag to --disable-apiserver
 2021-05-13 05:06:21 +02:00
MonzElmasry
5f24dd68d2 Add ci step to validate incorerct replacement fork 
Signed-off-by: MonzElmasry <menna.elmasry@rancher.com>
 2021-05-13 01:35:25 +02:00
MonzElmasry
e939805a5e change --disable-apiserver flag 
Signed-off-by: MonzElmasry <menna.elmasry@rancher.com>
 2021-05-13 00:25:07 +02:00
Menna Elmasry
8d0432824a Merge pull request #3209 from MonzElmasry/v1.20.6-k3s1 
Update to v1.20.6
v1.20.6-rc1+k3s1 v1.20.6+k3s1 		2021-04-16 01:39:24 +02:00
MonzElmasry
b06a5ffc2f Update to v1.20.6 
Signed-off-by: MonzElmasry <menna.elmasry@rancher.com>
 2021-04-16 00:09:38 +02:00
MonzElmasry
77390596e6 add cloud controller manager fixes from master 
Signed-off-by: MonzElmasry <menna.elmasry@rancher.com>
 2021-04-16 00:09:09 +02:00
MonzElmasry
ef28edaf9a Update to v1.20.6 
Signed-off-by: MonzElmasry <menna.elmasry@rancher.com>
 2021-04-15 21:50:35 +02:00
Brian Downs
62cce7931a Merge pull request #3199 from briandowns/backport_3197_1.20 
[Backport 1.20] - Resolve local retention issue when S3 in use.
 2021-04-14 13:42:27 -07:00
Brian Downs
1521e3b085 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:11:32 -07:00
Brian Downs
74c6711527 Merge pull request #3192 from briandowns/backport_pr_3155_1.20 
[Backport 1.20] Hidden Flags Bug Fix
 2021-04-14 09:01:04 -07:00
Brian Downs
221c9ae589 add hidden attribute to disable flags 
Signed-off-by: Brian Downs <brian.downs@gmail.com>
 2021-04-13 16:29:51 -07:00
Brian Downs
9a572ecae0 delete nocluster file and remove build tag 
Signed-off-by: Brian Downs <brian.downs@gmail.com>
 2021-04-13 16:29:51 -07:00
Brian Downs
3f73665131 remove hidden attribute from cluster flags and related code 
Signed-off-by: Brian Downs <brian.downs@gmail.com>
 2021-04-13 16:29:51 -07:00
Brian Downs
c87c3aba6d Merge pull request #3183 from briandowns/backport_3180_1.20 
[Backport 1.20] - add etcd s3 secret and access key flags to secret data
 2021-04-13 10:01:59 -07:00
Brian Downs
29f6275aae 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:53:12 -07:00
Brian Downs
881500d983 Merge pull request #3065 from briandowns/backport_add_etcd_backup_restore_s3-1.20 
[release-1.20] - Backport add etcd backup restore s3 1.20
v1.20.5-alpha1+k3s2 		2021-04-02 14:35:12 -07:00
Jacob Blain Christen
355fff3017 Update to Kubernetes v1.20.5 (#3094) 
* Update to Kubernetes v1.20.5
* vendor: bumps for some containerd deps
* go: bump to 1.16.2 for arm

Signed-off-by: Jacob Blain Christen <jacob@rancher.com>
v1.20.5+k3s1 v1.20.5-rc1+k3s1 		2021-03-19 11:50:37 -07:00
Brian Downs
c09142a3a7 put etcd bootstrap save call in goroutine and update comment 
Signed-off-by: Brian Downs <brian.downs@gmail.com>
 2021-03-18 12:52:03 -07:00
Jacob Blain Christen
a2b1d28c68 [release 1.20] containerd: v1.4.4-k3s1 (#3086) 
Addresses k3s-io/k3s#3067 and CVE-2021-21334

Signed-off-by: Jacob Blain Christen <jacob@rancher.com>
 2021-03-17 14:37:30 -07:00
Brian Downs
62839b302a remove duplicate method 
Signed-off-by: Brian Downs <brian.downs@gmail.com>
 2021-03-16 11:24:56 -07:00
Brian Downs
0167f86f5d Have Bootstrap Data Stored in etcd at Completed Start (#3038) 
* have state stored in etcd at completed start and remove unneeded code

Signed-off-by: Brian Downs <brian.downs@gmail.com>
(cherry picked from commit 7c99f8645d)
 2021-03-15 16:04:10 -07:00
Brian Downs
1da86eaa0b 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.

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

Signed-off-by: Brian Downs <brian.downs@gmail.com>
(cherry picked from commit 13229019f8)
 2021-03-15 16:02:47 -07:00
Chris Kim
bc400f5396 Define a Controllers and LeaderControllers on the server config (#3053) 
Signed-off-by: Chris Kim <oats87g@gmail.com>
 2021-03-12 07:27:42 -08:00
Brad Davidson
36b8c9fc18 Suppress test failure due to incompatible server 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit e628fe9280)
 2021-03-11 12:13:56 -08:00
Brad Davidson
01fc0249af Log clearer error on startup if NPC cannot be started 
Servers should always be upgraded before agents, but generally this
isn't required because things are compatible between versions. In this
case we're OK with failing closed if the user upgrades out of order, but
we should give a clearer message about what steps are required to fix
the issue.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 31bbae1eb1)
 2021-03-11 12:13:56 -08:00
Brad Davidson
4efbdf3381 Add script to test server/agent version compatibility 
We have had a couple issues with newer agents not working with old
servers or vice versa. Add a CI test to test variations on
uplevel/downlevel server/agent against latest, stable, and the previous
branch.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 357c375d04)
 2021-03-11 12:13:56 -08:00