- Addresses #3300
Signed-off-by: Jacob Blain Christen <dweomer5@gmail.com>

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

Update Kubernetes to v1.20.7-k3s1

- bump the runc version to v1.0.0-rc94
- build runc from its own source tree instead of from ./vendor/
  - side-steps incompatibility with upstream kubelet container manager

backport of #3305
addresses #3300
Signed-off-by: Jacob Blain Christen <dweomer5@gmail.com>

[release-1.20]Add ci step to validate incorerct replacement fork

[release-1.20] change --disable-api-server flag to --disable-apiserver

Signed-off-by: MonzElmasry <menna.elmasry@rancher.com>

Signed-off-by: MonzElmasry <menna.elmasry@rancher.com>

Update to v1.20.6

Signed-off-by: MonzElmasry <menna.elmasry@rancher.com>

Signed-off-by: MonzElmasry <menna.elmasry@rancher.com>

Signed-off-by: MonzElmasry <menna.elmasry@rancher.com>

[Backport 1.20] - Resolve local retention issue when S3 in use.

Remove early return preventing local retention policy to be enforced
resulting in N number of snapshots being stored.
Signed-off-by: Brian Downs <brian.downs@gmail.com>

[Backport 1.20] Hidden Flags Bug Fix

Signed-off-by: Brian Downs <brian.downs@gmail.com>

Signed-off-by: Brian Downs <brian.downs@gmail.com>

Signed-off-by: Brian Downs <brian.downs@gmail.com>

[Backport 1.20] - add etcd s3 secret and access key flags to secret data

Signed-off-by: Brian Downs <brian.downs@gmail.com>

[release-1.20] - Backport add etcd backup restore s3 1.20

* Update to Kubernetes v1.20.5
* vendor: bumps for some containerd deps
* go: bump to 1.16.2 for arm
Signed-off-by: Jacob Blain Christen <jacob@rancher.com>

Signed-off-by: Brian Downs <brian.downs@gmail.com>

Addresses k3s-io/k3s#3067 and CVE-2021-21334
Signed-off-by: Jacob Blain Christen <jacob@rancher.com>

Signed-off-by: Brian Downs <brian.downs@gmail.com>

* have state stored in etcd at completed start and remove unneeded code
Signed-off-by: Brian Downs <brian.downs@gmail.com>
(cherry picked from commit 7c99f864)

* Add functionality for etcd snapshot/restore to and from S3 compatible backends.
* Update etcd restore functionality to extract and write certificates and configs from snapshot.
Signed-off-by: Brian Downs <brian.downs@gmail.com>
(cherry picked from commit 4d1f9eda)

* add ability to perform an etcd on-demand snapshot via cli
Signed-off-by: Brian Downs <brian.downs@gmail.com>
(cherry picked from commit 13229019)

Signed-off-by: Chris Kim <oats87g@gmail.com>

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

Servers should always be upgraded before agents, but generally this
isn't required because things are compatible between versions. In this
case we're OK with failing closed if the user upgrades out of order, but
we should give a clearer message about what steps are required to fix
the issue.
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 31bbae1eb1f0372752a0479f19a3ce49ac30a24d)

We have had a couple issues with newer agents not working with old
servers or vice versa. Add a CI test to test variations on
uplevel/downlevel server/agent against latest, stable, and the previous
branch.
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 357c375d04737ed8300c9b5caaf25c7966a85013)

* Add disable flags for control components (#2900)

* Add disable flags to control components
Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>

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

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

* fixes to disable flags
Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>

* Add comments to functions
Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>

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

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

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

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

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

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

* remove etcd member if disable etcd is passed
Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>

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

* change error to warn when removing self from etcd members
Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>

* Mark disable components flags as experimental
Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>

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

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

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

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

* Collect IPs from all pods before deciding to use internal or external addresses

@Taloth correctly noted that the code that iterates over ServiceLB pods
to collect IP addresses was failing to add additional internal IPs once
the map contained ANY entry from a previous node. This may date back to
when ServiceLB used a Deployment instead of a DaemonSet, so there was
only ever a single pod.

The new behavior is to collect all internal and external IPs, and then
construct the address list of a single type - external if there are any,
otherwise internal.

https://github.com/k3s-io/k3s/issues/1652#issuecomment-774497788Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Co-authored-by: Brian Downs <brian.downs@gmail.com>

* Improve handling of comounted cpu,cpuacct controllers
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>