k3s: update to v1.22.x

Bumping k3s to version v1.22.2+k3s2-4-g737f722315, which comprises the following commits:

    737f722315 set transport to skip verify if se skip flag passed (#4102) (#4103)
    dd4b36e034 Add "etcd-" prefix to etcd-snapshot commands as aliases (#4161) (#4170)
    cedcece9cc Dual-stack support LB controller
    3f5774b41e Bump containerd to v1.5.7+k3s1
    bdd597fb9e Don't evacuate the root cgroup when rootless
    6d282b26c2 Skip tests that violate version skew policy
    a09bcba540 Properly handle operation as init process
    44013ae899 Enable the inheritance of settings for ipv6
    10bca343e8 Update build images to python3 for compat with recent gsutil change
    28be0de4e8 Revert "Use the newer klipper-lb image"
    64b502e92c Disable automounting service account token in servicelb pods
    7826407a2e Make sure there are no duplicates in etcd member list (#4025)
    1d21491094 Use the newer klipper-lb image
    753e11ee3c Enable JobTrackingWithFinalizers FeatureGate
    dccee4e87b Fix regression from commit 137e80cd865efe51aa3ef0323fd6b0a014b7b9de
    7a36c3f7f2 Bump golang version
    77dfdda909 Update Kubernetes to v1.22.2-k3s1
    eda65b19d9 Remove expiremental from cluster commands (#4024)
    debb508643 Nvidia container runtime discovery in containerd config template (#3890)
    086ca8ba6a Fix premature etcd shutdown when joining an existing cluster
    85e11c47d1 Add StargzSupported stub for Windows
    e732517712 Retrieve "CONTAINERD_" environment variables
    acf9036b63 No-op when etcd member was already removed and use existing name for etcd controller (#4014)
    9fcd79baae Add tests to the dual-stack PR and enable dual-stack with flannel backend
    681058bb40 Add dual-stack support
    5e0fae914f Bump helm-controller and klipper-helm image version
    b72306ce3d Return the error since it just gets logged and retried anyways
    5986898419 Use SubjectAccessReview to validate CCM RBAC
    dc556cbb72 Set controller authn/authz kubeconfigs
    199424b608 Pass context into all Executor functions
    137e80cd86 Handle cgroup v1/2/hybrid in check-config.sh more explicitly/accurately
    928b8531c3 [master] Add `etcd-member-management` controller to K3s (#4001)
    699ea16523 go mod tidy
    57377d2cd4 Minor cleanup on cribbed function
    3449d5b9f9 Wait for apiserver readyz instead of healthz
    3d27804c77 Anything not EL7 is EL8
    b4d8c641c6 Add exposed metrics listener instead of replacing loopback listener
    29c8b238e5 Replace klog with non-exiting fork
    90960ebf4e SupportPodPidsLimit is locked to true of 1.20, making pids cgroup support mandatory
    741ba95b04 Migrate sqlite data to etcd when initializing the cluster
    a1ec43e0b7 feat: add option to disable s3 over https
    8b857eef9c Ship Stargz Snapshotter (#2936)
    cf12a13175 Add missing node name entry to apiserver SAN list
    74196acaea added raspberry installation hint (#2379)
    fdaa0c4210 Update maintainers to reflect team changes
    b8add39b07 Bump kine for metrics/tls changes
    ad1a40a96c Small updates to CONTRIBUTING (#3734)
    933052a02c Fix condition for adding kubernetes endpoints (#3941)
    4d6ddfea51 Bump stable to v1.21.4+k3s1
    60297a1bbe Creation of K3s integration test Sonobuoy plugin (#3931)
    84155ee313 Make consistent use of os-release vars
    2a68c7c8a4 Fix issue where addon checksum was never stored
    736c262612 Move cniplugins version to 0.9.1
    96dcef478a Add functions to separate ipv4 from ipv6 functions
    a9fce84ab6 github actions: enable workflow_dispatch (#3923)
    114b30277f Redux: Enable K3s integration test to run on existing cluster (#3905)
    f94d8d76a8 Check /etc/os-release exists before sourcing it
    51b7451709 install.sh: Inform user of current k3s+SELinux support status for SUSE/openSUSE systems
    331c6fed71 Remove runtime V1 (`containerd-shim`)
    c23e63aeea Update RootlessKit to v0.14.5 (#3902)
    176451f4ea Fix rootless regression in 1.22 (Set KubeletInUserNamespace gate) (#3901)
    66dacc6ee0 Revert "Enable K3s integration test to run on existing cluster (#3892)" (#3899)
    703b5af950 Enable K3s integration test to run on existing cluster (#3892)
    58315fe135 Set osImage for docker image
    156bae2940 Fix PREVIOUS_CHANNEL lookup when current minor release is not stable
    e95b75409a Fix lint failures
    a5355f0827 Replace dropped v1beta1 APIs with v1
    dc14f370c4 Update wrangler to v0.8.5
    c434db7cc6 Wrap errors in runControllers for additional context
    422d266da2 Disable deprecated insecure port
    641ab26fde Update containerd to 1.5
    16616c6b90 Update grpc
    54a7c860c7 Update kine for etcd v3.5 compat
    92b651e548 update golangci config to sync with RKE2
    4ebd6009ea Bump gopls and golangci-lint
    872855015c Update etcd to v3.5.0
    e204d863a5 Update Kubernetes to v1.22.1
    ed5991f13b K3s Flock Integration Test (#3887)
    e322924781 Reset load balancer state during restoraion (#3877)
    a55921b33d Add missing labels to stalebot config
    8e90c56f5c Update Kubernetes to v1.21.4-k3s1
    544cf406aa Bump containerd to v1.4.9-k3s1
    a1097984c0 Bump helm-controller to work around tiller crashes
    b23955e835 Fix URL pruning when joining an etcd member (#3832)
    e87204c064 Added new testing documentation (#3823)
    a1e36153f9 Added locking system for integration tests (#3820)
    ae909c73e5 Updated the code to use GetNetworkByName and tweaked logic.
    4cc781b5e3 Moved testing utils into tests directory. Improved gotests template. (#3805)
    dcf0657b20 account for an s3 folder when listing objects (#3807)
    b4eca61aeb Prevent snapshot commands from creating empty snapshot directory (#3783)
    3b01157a3a Use New Image Names (#3749)
    bc96ffb5f3 Fix Node stuck at deletion (#3771)
    338f9cae3f Bump helm-controller to v0.10.2
    80a15bebc0 install.sh: Use built-in shell functionality instead of awk
    dfd4e42e57 Wrap context with lease before importing images
    2069cdf4ee Fix initial start of etcd only nodes (#3748)
    429af17e4d update rancher/local-path-provisioner to v0.0.20
    56109f96b3 Update MAINTAINERS (#3744)
    5ab3590d9b Improve config retrieval messages
    869b98bc4c Sync DisableKubeProxy into control struct
    4f03532f47 Add nightly automation tests
    09457a57d5 Add in stalebot config, starting with 6mo old stale issues. (#3739)
    b1b5f72dc3 Notify systemd for etcd only node (#3732)
    7704fb6ee5 Exporting the AddFeatureGate function and adding a unit test for it. (#3661)
    fc19b805d5 Added logic to strip any existing hyphens before processing the args. (#3662)
    a1d7a62493 Fix to allow non-root users access to storage volumes. (#3714)
    90445bd581 Wait until server is ready before configuring kube-proxy (#3716)
    21c8a33647 Introduction of Integration Tests (#3695)
    f99b1c8798 add gotests templates (#3709)
    71e1f1df8c Ignore markdown files for github actions (#3676)
    1f6806d940 Update 1.21 stable version
    20a48734c2 more fixes
    7ebcc4b134 more fixes
    b4401296ec replace error with warn in delete
    2f82bfcf67 fix warning msg
    b377839148 migrate old token key format
    997ed7b9b4 simplifying the code
    ad17292fa8 migrate empty string key properly
    a65e5b6466 Fix multiple bootstrap keys found
    37fcb61f5e move go routines for api server ready beneath wait group
    c5832c1128 Bump Kubernetes to v1.21.3
    b352d73511 Bump containerd to v1.4.8-k3s1
    18bc98f60c adding startup hooks args to access to Disables and Skips (#3674)
    dcabe14edd Update .github/ISSUE_TEMPLATE/feature_request.md
    8840c937e6 Update .github/ISSUE_TEMPLATE/bug_report.md
    bba49ea447 Fix to allow prune to correctly cleanup custom named snapshots (#3649)
    f6be76b4f7 Add checkbox to denote backporting required on issue templates
    aef8a6aafd Adding support for waitgroup to the Startuphooks (#3654)
    ad28d18b19 Bump helm-controller to v0.10.1 (#3644)
    d96fa8f727 Add issue template for creating release checklist issues (#3604)
    a939decf01 fix a runtime core panic (#3627)
    55fe4ff5b0 Convert existing unit tests to standard layout (#3621)
    fbc41ed753 Upgrade k3s-root version
    238dc2086e prevent snapshot save when snapshots are disabled (#3475)
    a4c992ce52 🐳 burp to inetaf/tcpproxy
    dd8398dc76 Bump the packaged runc binary version
    ada145641c Update etcd snapshot error message to be more informative when etcd database is not found (#3568)
    a62d143936 Fixing various bugs related to windows.
    e1cd9438ad Update ROADMAP.md
    81b006c938 Dispatch to rancher/system-agent-installer-k3s when tagged (#3589)
    73df2d806b Update embedded kube-router (#3557)
    77fcf2dfc5 missing build tag for windows
    18367e12d0 Set ulimits in docker-compose.yml
    8faa70dced Update to v1.21.2
    6b3285b7e3 Fix coverage reporting to include all packages, not just those with tests
    c833183517 Add unit tests for pkg/etcd (#3549)
    cbfe673c43 Fix spelling to satisfy codespell check
    cbacd7107e Allow passing targeted environment variables to containerd
    4a6e87e5a2 Add user-facing change section to PR template
    a5cff7e143 (docs) Update README.md
    f5fbb9a9a8 Export cli server flags and etcd restoration functions (#3527)
    246b378a27 Bump kine to resolve race condition and unrevisioned delete
    3e1693bc97 Changes local storage pods to have 700 permissions (#3537)
    7242ce9316 Redux: Add Unit Test Coverage to CI (#3524)
    04398a2582 Move cloud-controller-manager into an embedded executor (#3525)
    f3d0a857d2 Bump stable version to v1.21.2+k3s1 (#3526)
    a84c75af62 Adds a command-line flag '--disable-helm-controller' that will disable the server's built-in helm controller.
    cf55712767 Revert "Add Unit Test Coverage to CI (#3494)" (#3499)
    216b3beaef Add Unit Test Coverage to CI (#3494)
    82394d7d36 Basic windows agent that will join a cluster without CNI.
    136dddca11 Fix storing bootstrap data with empty token string (#3422)
    a629db023c Fail to start k3s if nm-cloud-setup is enabled
    4b2ab8b515 Renamed client-cloud-controller crt and key (#3470)
    ef23c6c548 Redux: Change containerd image leases from context lifespan to permanent  (#3464)
    b74c499709 Revert "Change containerd image leases from 24h to permanent (#3452)" (#3461)
    86b3ba8dba Change containerd image leases from 24h to permanent (#3452)
    88f95ec409 Send systemd notifications for both server and agent (#3430)
    a7d1159ba6 Emit events for AddOn lifecycle
    ea2cd6d727 Add comments, clean up imports and function names
    6e48ca9b53 Tidy up function calls with many args
    6ef000091a Add nodename to UA string for deploy controller
    2afa3dbe1c Changed iptables version check for fail if version is between 1.8.0 and 1.8.3 and using nf_tables mode (#3425)
    f6cec4e75d Add kubernetes.default.svc to serving certs
    243fd14cf1 Change Replace with ReplaceAll function
    afd506a595 fix possible race where bootstrap data might not save
    2682183773 add log message indicating etcd snapshots are disabled
    664a98919b Fix RBAC cloud-controller-manager name 3308 (#3388)
    5e0527f304 cgroup2 CI: add rootless
    daf527ccaf k3s-rootless.service: use fuse-overlayfs snapshotter
    1576030d6b Add a path for wireguard's privatekey
    7345ac35ae Initial windows support for agent (#3375)
    3abe7c7cef Bump stable version to v1.21.1+k3s1 and add v1.21 channel
    d415e41337 Update flannel version
    cb25835d84 containerd: v1.4.4-k3s2
    79cf4a7c83 Bump channel stable version to v1.20.7+k3s1
    25c2888d28 Fix shell expansion and file permission issues install.sh
    f11cbc5a8e runc: v1.0.0-rc95 (#3348)
    ecbf17e2ed move object channel defer close to goroutine
    254b52077e add retention default and wire in s3 prune
    7e175e8ad4 Handle conntrack-related sysctls in supervisor agent setup
    c824c3bcc1 Add support for multiple env files for systemd unit
    e8ecc00fc8 add etcd snapshot save subcommand

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/recipes-containers/k3s/k3s_git.bb b/recipes-containers/k3s/k3s_git.bb
index 68c66ec0..5971ddec 100644
--- a/recipes-containers/k3s/k3s_git.bb
+++ b/recipes-containers/k3s/k3s_git.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "https://k3s.io/"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://${S}/src/import/LICENSE;md5=2ee41112a44fe7014dce33e26468ba93"
 
-SRC_URI = "git://github.com/rancher/k3s.git;branch=release-1.21;name=k3s \
+SRC_URI = "git://github.com/rancher/k3s.git;branch=release-1.22;name=k3s \
            file://k3s.service \
            file://k3s-agent.service \
            file://k3s-agent \
@@ -13,9 +13,9 @@ SRC_URI = "git://github.com/rancher/k3s.git;branch=release-1.21;name=k3s \
            file://0001-Finding-host-local-in-usr-libexec.patch;patchdir=src/import \
           "
 SRC_URI[k3s.md5sum] = "363d3a08dc0b72ba6e6577964f6e94a5"
-SRCREV_k3s = "aa5a0a8c783a8a4475b727a04d6594c0fea09253"
+SRCREV_k3s = "737f722315b9832e9180fa232253d28ae1f2272f"
 
-PV = "v1.21.5+k3s1"
+PV = "v1.22.2+k3s1"
 
 CNI_NETWORKING_FILES ?= "${WORKDIR}/cni-containerd-net.conf"