1
0
mirror of https://github.com/rancher/rke.git synced 2025-07-14 23:56:06 +00:00
Commit Graph

2167 Commits

Author SHA1 Message Date
Bruno Bachmann
f7485b8dce [v1.4.19] s4: Fix 478 2024-06-10 15:41:23 -07:00
Krunal Hingu
589cb504a2
Merge pull request #3594 from krunalhinguu/v2.7-may-2024-patches
[release/v1.4.19] Vendor May patch KDM data
2024-05-29 12:54:30 +05:30
Krunal Hingu
d4e7085d6a go generate 2024-05-29 11:16:41 +05:30
Krunal Hingu
b9227582aa update kdm branch for may patches 2024-05-29 10:57:00 +05:30
Jiaqi Luo
daf80519d4
Merge pull request #3585 from jiaqiluo/14-kdm 2024-05-13 14:19:20 -07:00
Jiaqi Luo
9d7f85c708 switch KDM branch to dev-v2.7 2024-05-13 12:55:11 -07:00
Jiaqi Luo
a70250c6d8
Merge pull request #3581 from jiaqiluo/14-prepare-release 2024-05-13 12:22:16 -07:00
Jiaqi Luo
92960971bb go generate 2024-05-13 11:35:07 -07:00
Jiaqi Luo
f473bc82ba switch KDM branch to release-v2.7 2024-05-13 11:33:55 -07:00
Vardhaman Surana
0e8fd4c757
Merge pull request #3564 from vardhaman22/update-kdm-data
[v2.7] update kdm data
2024-04-24 19:19:35 +05:30
vardhaman22
2c415934af go generate 2024-04-24 10:47:02 +05:30
vardhaman22
32a6677a01 switch kdm branch to dev-v2.7 2024-04-24 10:46:45 +05:30
Jiaqi Luo
7de130ae22
Merge pull request #3553 from rancher/githubaction-go-generate-2024-04-10-22-14-37 2024-04-10 21:38:36 -07:00
github-actions[bot]
8c8c2a1a3e go generate 2024-04-10 22:14:37 +00:00
Jiaqi Luo
4d04f39272
Merge pull request #3540 from rancher/githubaction-go-generate-2024-03-27-18-01-04 2024-03-27 15:22:11 -07:00
github-actions[bot]
12d4ada533 go generate 2024-03-27 18:01:04 +00:00
Jiaqi Luo
1f63ebd340
Merge pull request #3527 from rancher/release/v1.4.16 2024-03-11 17:15:41 -07:00
Jiaqi Luo
5729336887
Merge pull request #3529 from rancher/githubaction-go-generate-2024-03-11-15-09-35 2024-03-11 16:13:28 -07:00
github-actions[bot]
6aeec55a25 go generate 2024-03-11 15:09:36 +00:00
Jacob Lindgren
bc8a5b3f27
Merge pull request #3524 from thatmidwesterncoder/release_1.4.16
[1.4.16] Feb 2024 patches: Release 1.4.16
2024-03-07 16:56:21 -06:00
Jacob Lindgren
290e7a8544
Point KDM at release URL 2024-03-07 16:03:00 -06:00
Chirayu Kapoor
40484e9557
Merge pull request #3519 from chiukapoor/1.4.16-go-generate
[v1.4.16] go generate
2024-03-07 18:49:28 +05:30
Chirayu Kapoor
548f9a02b0
go generate
Signed-off-by: Chirayu Kapoor <chirayu.kapoor@suse.com>
2024-03-07 17:57:06 +05:30
Chirayu Kapoor
ffbcedcd99
Merge pull request #3516 from noironetworks/aci-6041-rke-1.4.16
[v1.4] Add ACI CNI 6033, 6041 variables
2024-03-06 22:35:37 +05:30
JeffinKottaram
1f771dddca go generate 2024-03-05 23:49:52 -08:00
JeffinKottaram
077d5c93c8 Add ACI CNI 6041 variables 2024-03-05 23:48:51 -08:00
Krunal Hingu
20422b5ae7
Merge pull request #3512 from krunalhinguu/v2.7-sync-kdm-data
[v2.7] Vendor KDM data
2024-03-01 09:58:14 +05:30
Krunal Hingu
05898141ec go generate 2024-02-29 11:18:14 +05:30
Krunal Hingu
22897cb645 update kdm branch for feb 2024 patches 2024-02-29 11:17:11 +05:30
Jacob Lindgren
9e49ce0c7c
Merge pull request #3510 from thatmidwesterncoder/v1.14.15
Point KDM at release URL for release
2024-02-27 13:21:34 -06:00
Jacob Lindgren
d7d5ebeedf
Point KDM at release URL 2024-02-27 12:45:35 -06:00
Vardhaman Surana
dc77b25ea1
Merge pull request #3505 from vardhaman22/vardhaman22/relesae-v1.4
[release/v1.4] sync release/v1.4 with release/v1.4.14
2024-02-21 21:06:37 +05:30
vardhaman22
251ead6e86 Merge branch 'release/v1.4.14' into vardhaman22/release-v1.4 2024-02-16 19:29:18 +05:30
Kinara Shah
811afd3b7f
Merge pull request #3501 from kinarashah/v1414
[v1.4.14] update kdm data
2024-02-13 13:36:27 -08:00
Kinara Shah
4f2abe6a2c update kdm data 2024-02-13 13:10:22 -08:00
Sergey Nasovich
dd2f15b915
Merge pull request #3498 from rancher/githubaction-go-generate-2024-02-12-19-26-01 2024-02-13 10:48:54 -05:00
github-actions[bot]
b8b3ae0afd go generate 2024-02-12 19:26:01 +00:00
Vardhaman Surana
bd74683128
Merge pull request #3494 from vardhaman22/2.7.11-update-containerd-runc
[v2.7] updated containerd and runc dependencies
2024-02-06 13:08:49 +05:30
Vardhaman Surana
9764705654
Merge pull request #3486 from vardhaman22/v2.7-change-etcd-restore-container-image
[v1.4] changed etcd restoreImage to rke-tools for etcd >=3.5.7
2024-02-05 10:16:27 +05:30
vardhaman22
db25725d60 go mod tidy 2024-02-02 19:38:02 +05:30
vardhaman22
5bf7712586 bump containerd to v1.6.27 and runc to v1.1.12 2024-02-02 19:37:29 +05:30
Vardhaman Surana
7eb594ee07
Merge pull request #3488 from vardhaman22/v1.4.14-change-etcd-restore-container-image
[v1.4.14] changed etcd restoreImage to rke-tools for etcd >=3.5.7
2024-02-02 10:05:34 +05:30
Chirayu Kapoor
aefc86896e
Merge pull request #3489 from krunalhinguu/v2.7.11-jan-patches
[release/v1.4.14] Vendor January patch KDM data
2024-02-01 10:12:31 +05:30
Jiaqi Luo
b4b6164187
Merge pull request #3492 from jiaqiluo/backport-fix-docker 2024-01-30 15:03:13 -07:00
Jiaqi Luo
50a6de2492 downgrade docker to 20.10.25 (backport rke/pull/3352); switch github.com/rancher/normal module to the commit in the release/v2.7 branch 2024-01-30 11:37:48 -07:00
Krunal Hingu
f2c013117a go generate 2024-01-30 12:38:22 +05:30
Krunal Hingu
06b5ed2ac5 vendor january patches KDM data 2024-01-30 12:37:52 +05:30
vardhaman22
43a4573f89 changed etcd restoreImage to rke-tools for etcd >=3.5.7 2024-01-29 15:59:54 +05:30
vardhaman22
adaec2efa7 changed etcd restoreImage to rke-tools for etcd >=3.5.7 2024-01-25 11:40:19 +05:30
Jiaqi Luo
f329e90778
Merge pull request #3482 from jiaqiluo/support-127 2024-01-23 16:41:54 -07:00