MIRRORS/meta-virtualization
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-virtualization.git synced 2025-07-19 20:59:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

k3s: bump to v1.19

Browse Source 
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
This commit is contained in:
Bruce Ashfield 2020-11-12 15:21:28 -05:00
parent a0c94280cf
commit 159990bfa3
2 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
recipes-containers/k3s/k3s/0001-Finding-host-local-in-usr-libexec.patch
View File

@ -9,19 +9,16 @@ Signed-off-by: <erikja@axis.com>
pkg/agent/config/config.go | 2 +- pkg/agent/config/config.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkg/agent/config/config.go b/pkg/agent/config/config.go Index: import/pkg/agent/config/config.go
index b4296f360a..6af9dab895 100644 ===================================================================
--- a/pkg/agent/config/config.go --- import.orig/pkg/agent/config/config.go
+++ b/pkg/agent/config/config.go +++ import/pkg/agent/config/config.go
@@ -308,7 +308,7 @@ func get(envInfo *cmds.Agent) (*config.Node, error) { @@ -445,7 +445,7 @@
return nil, err
} }
if !nodeConfig.NoFlannel {
- hostLocal, err := exec.LookPath("host-local") - hostLocal, err := exec.LookPath("host-local")
+ hostLocal, err := exec.LookPath("/usr/libexec/cni/host-local") + hostLocal, err := exec.LookPath("/usr/libexec/cni/host-local")
if err != nil { if err != nil {
return nil, errors.Wrapf(err, "failed to find host-local") return nil, errors.Wrapf(err, "failed to find host-local")
} }
--
2.11.0

6
recipes-containers/k3s/k3s_git.bb
View File

@ -4,7 +4,7 @@ HOMEPAGE = "https://k3s.io/"
LICENSE = "Apache-2.0" LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://${S}/src/import/LICENSE;md5=2ee41112a44fe7014dce33e26468ba93" 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.service \
file://k3s-agent.service \ file://k3s-agent.service \
file://k3s-agent \ 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 \ file://0001-Finding-host-local-in-usr-libexec.patch;patchdir=src/import \
" "
SRC_URI[k3s.md5sum] = "363d3a08dc0b72ba6e6577964f6e94a5" 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" CNI_NETWORKING_FILES ?= "${WORKDIR}/cni-containerd-net.conf"