Commit Graph

7 Commits

Author SHA1 Message Date
Derek Nola
0663681a3d Replace rancher with k3s-io (#5585)
Signed-off-by: Derek Nola <derek.nola@suse.com>
2022-05-19 15:54:21 -07:00
Brad Davidson
1da571ff69 Remove unnecessary copies of etcdconfig struct
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit a1b800f0bf)
2022-03-15 18:08:33 -07:00
Brad Davidson
9d1240577f Fix cluster bootstrap test
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 54bb65064e)
2022-03-15 18:08:33 -07:00
Derek Nola
2561285e8e Backport of https://github.com/k3s-io/k3s/pull/4372 (#4654)
Signed-off-by: Derek Nola <derek.nola@suse.com>
2021-12-07 15:29:31 -08:00
Brian Downs
97f494a24d [Release-1.22] All bootstrap backport (#4448)
Add ability to reconcile bootstrap data between datastore and disk (#3398)
2021-11-10 16:20:20 -07:00
Brad Davidson
46eea2f10a Revert "Add ability to reconcile bootstrap data between datastore and disk (#3398)"
This reverts commits
9a4ca5978b
c9f6fa0be0
07f844cf95
48355dce10

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2021-10-27 14:17:12 -07:00
Brian Downs
48355dce10 Add ability to reconcile bootstrap data between datastore and disk (#3398)
Signed-off-by: Brian Downs <brian.downs@gmail.com>
2021-10-25 16:23:31 -07:00