aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2020-11-12 15:21:28 -0500
committerBruce Ashfield <bruce.ashfield@gmail.com>2021-03-15 23:15:42 -0400
commit159990bfa39a74424c16d98b493979d331bfcf71 (patch)
treeb79b3a6ebc362438d64719b817b4858f0e195ea0
parenta0c94280cf4eb35ef05f8d91c66c75746d9e25b0 (diff)
downloadmeta-virtualization-159990bfa39a74424c16d98b493979d331bfcf71.tar.gz
meta-virtualization-159990bfa39a74424c16d98b493979d331bfcf71.tar.bz2
meta-virtualization-159990bfa39a74424c16d98b493979d331bfcf71.zip
k3s: bump to v1.19
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
-rw-r--r--recipes-containers/k3s/k3s/0001-Finding-host-local-in-usr-libexec.patch25
-rw-r--r--recipes-containers/k3s/k3s_git.bb6
2 files changed, 14 insertions, 17 deletions
diff --git a/recipes-containers/k3s/k3s/0001-Finding-host-local-in-usr-libexec.patch b/recipes-containers/k3s/k3s/0001-Finding-host-local-in-usr-libexec.patch
index 8205d73..524ac2c 100644
--- a/recipes-containers/k3s/k3s/0001-Finding-host-local-in-usr-libexec.patch
+++ b/recipes-containers/k3s/k3s/0001-Finding-host-local-in-usr-libexec.patch
@@ -9,19 +9,16 @@ Signed-off-by: <erikja@axis.com>
pkg/agent/config/config.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/pkg/agent/config/config.go b/pkg/agent/config/config.go
-index b4296f360a..6af9dab895 100644
---- a/pkg/agent/config/config.go
-+++ b/pkg/agent/config/config.go
-@@ -308,7 +308,7 @@ func get(envInfo *cmds.Agent) (*config.Node, error) {
- return nil, err
+Index: import/pkg/agent/config/config.go
+===================================================================
+--- import.orig/pkg/agent/config/config.go
++++ import/pkg/agent/config/config.go
+@@ -445,7 +445,7 @@
}
-- hostLocal, err := exec.LookPath("host-local")
-+ hostLocal, err := exec.LookPath("/usr/libexec/cni/host-local")
- if err != nil {
- return nil, errors.Wrapf(err, "failed to find host-local")
- }
---
-2.11.0
-
+ if !nodeConfig.NoFlannel {
+- hostLocal, err := exec.LookPath("host-local")
++ hostLocal, err := exec.LookPath("/usr/libexec/cni/host-local")
+ if err != nil {
+ return nil, errors.Wrapf(err, "failed to find host-local")
+ }
diff --git a/recipes-containers/k3s/k3s_git.bb b/recipes-containers/k3s/k3s_git.bb
index ea5ed75..bc99218 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.18;name=k3s \
+SRC_URI = "git://github.com/rancher/k3s.git;branch=release-1.19;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.18;name=k3s \
file://0001-Finding-host-local-in-usr-libexec.patch;patchdir=src/import \
"
SRC_URI[k3s.md5sum] = "363d3a08dc0b72ba6e6577964f6e94a5"
-SRCREV_k3s = "630bebf94b9dce6b8cd3d402644ed023b3af8f90"
+SRCREV_k3s = "970fbc66d384ce15bda6684c8610e65b406154ca"
-PV = "v1.18.9+git${SRCPV}"
+PV = "v1.19.3+git${SRCPV}"
CNI_NETWORKING_FILES ?= "${WORKDIR}/cni-containerd-net.conf"