Commit Graph

6 Commits (8d13e68cc539b96ac23cd665bdb9bf652d51a2ea)

Author SHA1 Message Date
Brad Davidson f55f09672e Fix adding etcd-only node to existing cluster
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 5014c9e0e8)
2022-03-15 18:09:00 -07:00
Derek Nola e7fe71ea1e
[Engine-1.21] Secrets-encryption rotation (#4656)
* Backport secrets encrypt rotation
* Backport integration fixes for custom etcd args

Signed-off-by: Derek Nola <derek.nola@suse.com>
2021-12-07 21:55:00 -08:00
Brad Davidson 8f82ae0749
Increase agent's apiserver ready timeout (#4456)
Since we now start the server's agent sooner and in the background, we
may need to wait longer than 30 seconds for the apiserver to become
ready on downstream projects such as RKE2.

Since this essentially just serves as an analogue for the server's
apiReady channel, there's little danger in setting it to something
relatively high.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2021-11-11 14:03:30 -07:00
Brad Davidson c1b193ae26 Minor cleanup on cribbed function
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 57377d2cd4)
2021-10-20 12:35:16 -07:00
Brad Davidson e8d30101a6 Wait for apiserver readyz instead of healthz
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 3449d5b9f9)
2021-10-20 12:35:16 -07:00
Xiao Deshi cfe7e0c734 remove duplicated func GetAddresses
refactor tunnel.go and controller.go, remove duplicated lines.

Signed-off-by: Xiao Deshi <xiaods@gmail.com>
2021-03-31 14:23:05 -07:00