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

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

* Bump containerd to v1.4.12-k3s1
* Bump golang to 1.16.10 and sonobuoy to 0.55.0
* Change timeout to 60m
Signed-off-by: Chris Kim <oats87g@gmail.com>

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

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

[Release 1.21] Allow svclb pod to enable ipv6 forwarding

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

[Release 1.21] Backport new cniplugins and klipper-lb image version

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

[Release 1.21] Backport dual stack

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

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

[Release 1.21] Fix bug in dual-stack

We forgot to remove the check to allow dual-stack and flannel
Signed-off-by: Manuel Buil <mbuil@suse.com>

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

* Match to last After keyword for parser (#4383)
* 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>

* Export cli server flags and etcd restoration functions (#3527)

* Export cli server flags and etfd restoration functions
Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>

* export S3
Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
Signed-off-by: Chris Kim <oats87g@gmail.com>

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

* Remove integration test
Signed-off-by: Chris Kim <oats87g@gmail.com>
Co-authored-by: Hussein Galal <galal-hussein@users.noreply.github.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>

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

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)

* Update to v1.21.6
Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>

* Ignore go.mod and go.sum for codespell
Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>

* Update to v1.21.6
Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>

This reverts commit
f0ea0a09Signed-off-by: Brad Davidson <brad.davidson@rancher.com>

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

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

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

[Release-1.21] Update to the newest flannel

Fixes issues such as the internode connectivity
Signed-off-by: Manuel Buil <mbuil@suse.com>

Signed-off-by: Manuel Buil <mbuil@suse.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)

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)