Merge pull request k0sproject#909 from ncopa/kube-1.21.1

Kube 1.21.1 cherry-picks for release-1.21

Merge pull request k0sproject#909 from ncopa/kube-1.21.1

Kube 1.21.1 cherry-picks for release-1.21

No unit tests on windows

Signed-off-by: Kimmo Lehto <klehto@mirantis.com>

Merge pull request k0sproject#901 from jnummelin/cherries-for-1.21.0+…

…k0s.1

Cherries for 1.21.0+k0s.1

Merge pull request k0sproject#874 from soider/fix/rebase-issues

Fix merge conflict in the pkg/backup

Merge pull request k0sproject#874 from soider/fix/rebase-issues

Fix merge conflict in the pkg/backup

Exclude calico images from airgap list on armv7

Signed-off-by: Jussi Nummelin <jnummelin@mirantis.com>

Fix release image bundle step id's

Signed-off-by: Jussi Nummelin <jnummelin@mirantis.com>

Merge pull request k0sproject#853 from jnummelin/remove-plus-from-ima…

…ge-tags

Replace + with - on image tags

Merge pull request k0sproject#853 from jnummelin/remove-plus-from-ima…

…ge-tags

Replace + with - on image tags