From 77f8a0b4d43d17d983179d6c0ce48b4a270e59ee Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Thu, 15 Apr 2021 22:58:28 -0400 Subject: [PATCH] k3s: update to v1.20.6 Bumping to the latest 1.20.x release, which comprises the following commits: b06a5ffc2f Update to v1.20.6 77390596e6 add cloud controller manager fixes from master ef28edaf9a Update to v1.20.6 1521e3b085 Resolve local retention issue when S3 in use. 221c9ae589 add hidden attribute to disable flags 9a572ecae0 delete nocluster file and remove build tag 3f73665131 remove hidden attribute from cluster flags and related code 29f6275aae add etcd s3 secret and access key flags and env vars to secret data 355fff3017 Update to Kubernetes v1.20.5 (#3094) c09142a3a7 put etcd bootstrap save call in goroutine and update comment a2b1d28c68 [release 1.20] containerd: v1.4.4-k3s1 (#3086) 62839b302a remove duplicate method 0167f86f5d Have Bootstrap Data Stored in etcd at Completed Start (#3038) 1da86eaa0b Etcd Snapshot/Restore to/from S3 Compatible Backends (#2902) 0a3360fc6f Add ability to perform an etcd on-demand snapshot via cli (#2819) Signed-off-by: Bruce Ashfield --- recipes-containers/k3s/k3s_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-containers/k3s/k3s_git.bb b/recipes-containers/k3s/k3s_git.bb index 2811fb8f..20345f26 100644 --- a/recipes-containers/k3s/k3s_git.bb +++ b/recipes-containers/k3s/k3s_git.bb @@ -13,9 +13,9 @@ SRC_URI = "git://github.com/rancher/k3s.git;branch=release-1.20;name=k3s \ file://0001-Finding-host-local-in-usr-libexec.patch;patchdir=src/import \ " SRC_URI[k3s.md5sum] = "363d3a08dc0b72ba6e6577964f6e94a5" -SRCREV_k3s = "bc400f5396a3dd05584c5f45768a5ea6c43971d1" +SRCREV_k3s = "8d0432824a9fd9474b67138b7630c33f285d332f" -PV = "v1.20.4+k3s1" +PV = "v1.20.6+k3s1" CNI_NETWORKING_FILES ?= "${WORKDIR}/cni-containerd-net.conf"