k3s-io
/
k3s
mirror of https://github.com/k3s-io/k3s.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
905 Commits
31 Branches
776 Tags
634 MiB
Commit Graph

905 Commits (release-1.16)

Author SHA1 Message Date
Jacob Blain Christen 31fddb21b5
[release 1.16] containerd: v1.3.10-k3s1 (#3083) 
Addresses k3s-io/k3s#3077 and CVE-2021-21334

Signed-off-by: Jacob Blain Christen <jacob@rancher.com>
 2021-03-17 14:34:38 -07:00
Erik Wilson 790b740f01
Merge pull request #2200 from erikwilson/release-1.16 
Update to v1.16.15-k3s1
 2020-09-03 14:36:00 -07:00
Erik Wilson 552d29bf79 Update to v1.16.15-k3s1 
Signed-off-by: Erik Wilson <Erik.E.Wilson@gmail.com>
 2020-09-03 13:32:46 -07:00
Brad Davidson 49b26dee81
Merge pull request #2127 from brandond/v1.16.14-k3s1 
Update to v1.16.14-k3s1
 2020-08-13 16:28:56 -07:00
Brad Davidson e4ee2fadf7 Update release-1.16 to v1.16.14-k3s1 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2020-08-13 15:12:44 -07:00
Brad Davidson b720367fc5
Merge pull request #2033 from brandond/fix-1.16-drone-secret 
Backport drone config from 1.17 (minus RPMs)
 2020-07-16 12:36:58 -07:00
Brad Davidson eb5cdfe7b8 Backport drone config from 1.17 (minus RPMs) 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2020-07-16 12:03:25 -07:00
Brad Davidson 15c4ba3f93 Fix CI dispatch failure due to incorrect secret name 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2020-07-16 10:12:03 -07:00
Brad Davidson 8b33f7f594
Merge pull request #2030 from brandond/v1.16.13-rc1+k3s1 
Update to v1.16.13-k3s1
 2020-07-15 21:16:10 -07:00
Brad Davidson d833224d96 Update to v1.16.13-k3s1 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2020-07-15 20:41:41 -07:00
Erik Wilson 81f49ac358
Merge pull request #1981 from erikwilson/release-1.16 
backport 1.16: Replace juju/errors with pkg/errors
 2020-07-10 10:43:06 -07:00
Erik Wilson 20e5a91187
Replace juju/errors with pkg/errors 2020-06-30 18:14:50 -07:00
Hussein Galal 358ac59cb4
Update v1.16.11+k3s1 (#1926) 2020-06-17 21:39:57 +02:00
Erik Wilson 5e9f690000
Merge pull request #1837 from briandowns/release-1.16 
update CNI to v0.8.6-k3s1
 2020-05-28 17:05:40 -07:00
Brian Downs 46549e1d17 update CNI to v0.8.6-k3s1 2020-05-28 14:57:48 -07:00
Erik Wilson e58c2c9c00
Merge pull request #1830 from erikwilson/release-1.16 
Update k8s 1.16.10
 2020-05-27 05:03:42 -07:00
Erik Wilson 2250ae6797 Update k8s 1.16.10 2020-05-26 15:45:45 -07:00
Erik Wilson 3d85b03ecb Bump golang to 1.13.11 2020-05-26 15:39:48 -07:00
Erik Wilson eb4ad1b3f4
Merge pull request #1761 from erikwilson/release-1.16 
Backport Release 1.16: Update runc to rc10
 2020-05-05 18:35:53 -07:00
Erik Wilson 032e65c4d9 Update runc to rc10 2020-05-05 17:51:04 -07:00
Erik Wilson 6568a4b878 Check for correct go vendoring 2020-05-05 16:41:48 -07:00
Erik Wilson b35def736e
Merge pull request #1699 from galal-hussein/v1.16.9-k3s1 
Update k8s to v1.16.9
 2020-04-30 12:26:28 -07:00
galal-hussein 0591d30fdd update k8s to 1.16.9 2020-04-30 16:08:34 +02:00
Erik Wilson 74fe7bdaff
Merge pull request #1460 from galal-hussein/dispatch_event_fix_116 
[Backport v1.16] Add depends on manifest to dispatch
 2020-02-26 18:44:38 -07:00
galal-hussein 555d4c2f51 Add depends on manifest to dispatch 2020-02-27 02:56:26 +02:00
Erik Wilson 16c99b871b
Merge pull request #1458 from galal-hussein/dispatch_backport_116 
Send dispatch event with drone
 2020-02-26 17:01:14 -07:00
galal-hussein 4753e58bd5 Send dispatch event with drone 2020-02-27 00:09:41 +02:00
Erik Wilson c5f003b266 Upgrade k8s to v1.16.7 2020-02-13 16:49:39 -07:00
Erik Wilson 13925a8798
Merge pull request #1352 from erikwilson/update-k8s-v1.16.6 
Update k8s to v1.16.6
 2020-01-31 09:57:01 -07:00
Erik Wilson 2381a01b77 Update k8s to v1.16.6 2020-01-24 16:39:33 -07:00
Erik Wilson 3658610082 Update build system from master 2020-01-24 11:23:05 -07:00
Erik Wilson f908edd1cb Fix identity_token -> identitytoken for containerd toml 2020-01-24 08:29:12 -07:00
Erik Wilson 0e58960aec Containerd patch 3889 2020-01-24 08:29:12 -07:00
Erik Wilson 18bd921cdd
Merge pull request #1100 from ibuildthecloud/master 
Bump kine/k8s to fix broken label based pagination
 2019-11-18 13:29:42 -07:00
Darren Shepherd 1ad4765353 Bump kine/k8s to fix broken label based pagination 2019-11-18 18:48:42 +00:00
galal-hussein 99b8222e8d Change storage to datastore 2019-11-15 21:52:07 -07:00
galal-hussein bdf9dd2bca go mod vendor 2019-11-15 21:52:07 -07:00
Darren Shepherd c2e7f9c7b0 Add logging parameters 2019-11-15 21:51:51 -07:00
Darren Shepherd 59177e58b7 Bump dynamiclistener to support RSA keys 2019-11-15 21:51:51 -07:00
Darren Shepherd 4e544bded2 Delete unused code 2019-11-15 21:51:51 -07:00
Darren Shepherd ff34c5c5cf Download cert/key to agent with single HTTP request 
Since generated cert/keys are stored locally, each server has a different
copy.  In a HA setup we need to ensure we download the cert and key from
the same server so we combined HTTP requests to do that.
 2019-11-15 21:51:51 -07:00
Erik Wilson fe4b9cafd6
Merge pull request #1079 from erikwilson/bump-k8s-1.16.3-k3s.1 
Bump k8s to v1.16.3-k3s.1
 2019-11-14 16:33:04 -07:00
Erik Wilson 39c0224f0e
Merge pull request #1080 from erikwilson/fix-agent-token-env 
Fix broken K3S_TOKEN env
 2019-11-14 16:32:48 -07:00
Erik Wilson 95ff805c98 Fix broken K3S_TOKEN env 2019-11-14 12:42:42 -07:00
Erik Wilson 82702a2a64 Bump k8s to v1.16.3-k3s.1 2019-11-14 11:56:24 -07:00
Erik Wilson 35715bd9ec
Merge pull request #1071 from warmchang/BUILDING 
📰 Modify BUILDING description
 2019-11-14 10:59:14 -07:00
Erik Wilson 293e996de7
Merge pull request #1075 from erikwilson/sudo-check-config-no-redirect 
Revert check-config's "Silence modprobe warnings"
 2019-11-14 10:57:36 -07:00
Erik Wilson 3c945476f6 Revert check-config's "Silence modprobe warnings" 
This reverts commit 8edbe30c8c.
 2019-11-14 10:56:37 -07:00
William Zhang 0081225ae5 📰 Modify BUILDING description 
Signed-off-by: William Zhang <zhang.wanmin@zte.com.cn>
 2019-11-14 18:54:50 +08:00
Darren Shepherd 4a26727938
Merge pull request #1070 from ibuildthecloud/kine-fix 
Ensure that revision is consistent for empty lists
 2019-11-14 06:31:48 +00:00