* Update to v1.21.7
Signed-off-by: Chris Kim <oats87g@gmail.com>

Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>

Signed-off-by: Derek Nola <derek.nola@suse.com>

* Remove skip warning
* Add warning back in but without value
Signed-off-by: Derek Nola <derek.nola@suse.com>

* Match to last After keyword for parser (#4383)
* Made parser able to skip over subcommands
* Fix to allow etcd-snapshot to use config file with flags that are only used with k3s server. (#4464)
Signed-off-by: Derek Nola <derek.nola@suse.com>

* Add etcd extra args support for K3s
Signed-off-by: Chris Kim <oats87g@gmail.com>

* Add etcd custom argument integration test
Signed-off-by: Chris Kim <oats87g@gmail.com>

* Redux: Enable K3s integration test to run on existing cluster (#3905)

* Made it possible to run int tests on existing cluster
Signed-off-by: dereknola <derek.nola@suse.com>
Signed-off-by: Chris Kim <oats87g@gmail.com>
Co-authored-by: Derek Nola <derek.nola@suse.com>

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>

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 199424b6)

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 29c8b238)

Add ability to reconcile bootstrap data between datastore and disk (#3398)

* updating to new signals package in wrangler
Signed-off-by: Luther Monson <luther.monson@gmail.com>

Required to support apiextensions.v1 as v1beta1 has been deleted. Also
update helm-controller and dynamiclistener to track wrangler versions.
Signed-off-by: Luther Monson <luther.monson@gmail.com>
Co-authored-by: Brad Davidson <brad.davidson@rancher.com>

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 3da1bb3a)

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 5acd0b90)

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 3fe460d0)

Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>

This reverts commits
c5a91545
45c5d78cSigned-off-by: Brad Davidson <brad.davidson@rancher.com>

Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>

Signed-off-by: dereknola <derek.nola@suse.com>

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>

Using MAINPID breaks systemd's exit detection, as it stops watching the
original pid, but is unable to watch the new pid as it is not a child
of systemd itself. The best we can do is just notify when execing the child
process.

We also need to consolidate forking into a sigle place so that we don't
end up with multiple levels of child processes if both redirecting log
output and reaping child processes.
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit dc18ef2e)

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 88178ae65e39482078d794289c05cb92f2b106f7)

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 086ca8ba)

Partial cherry-pick from 29c8b238Signed-off-by: Brad Davidson <brad.davidson@rancher.com>

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 699ea165)

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 57377d2c)

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 3449d5b9)

[engine-1.21] Fix race condition in cloud provider

Signed-off-by: Manuel Buil <mbuil@suse.com>

* Display cluster tls error only in debug mode
Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>

* fix
Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>

* Make sure there are no duplicates in etcd member list
Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>

* fix node names with hyphens
Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>

* use full server name for etcd node name
Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>

* Add "etcd-" prefix to etcd-snapshot commands as alias
Signed-off-by: dereknola <derek.nola@suse.com>

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>