From: Adam Johnston <[email protected]>

The config list provided by the K3s recipe follows the format for a
config list (.conflist) but has the extension of a config file (.conf).
When the file is parsed, this results in...

failed to load CNI config file /etc/cni/net.d/cni-containerd-net.conf
error parsing configuration: missing 'type': invalid cni config

Rename the file from .conf to .conflist so that it is parsed correctly.
This matches how the file is named for containerd and kubernetes
recipes.

Signed-off-by: Adam Johnston <[email protected]>
---
 .../{cni-containerd-net.conf => cni-containerd-net.conflist}    | 0
 recipes-containers/k3s/k3s_git.bb                               | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename recipes-containers/k3s/k3s/{cni-containerd-net.conf => 
cni-containerd-net.conflist} (100%)

diff --git a/recipes-containers/k3s/k3s/cni-containerd-net.conf 
b/recipes-containers/k3s/k3s/cni-containerd-net.conflist
similarity index 100%
rename from recipes-containers/k3s/k3s/cni-containerd-net.conf
rename to recipes-containers/k3s/k3s/cni-containerd-net.conflist
diff --git a/recipes-containers/k3s/k3s_git.bb 
b/recipes-containers/k3s/k3s_git.bb
index a1e3ec8c..7269c094 100644
--- a/recipes-containers/k3s/k3s_git.bb
+++ b/recipes-containers/k3s/k3s_git.bb
@@ -9,7 +9,7 @@ SRC_URI = 
"git://github.com/rancher/k3s.git;branch=release-1.34;name=k3s;protoco
            file://k3s-agent.service \
            file://k3s-agent \
            file://k3s-clean \
-           file://cni-containerd-net.conf \
+           file://cni-containerd-net.conflist \
            
file://0001-Finding-host-local-in-usr-libexec.patch;patchdir=src/import \
            file://k3s-killall.sh \
           "
-- 
2.34.1

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#9600): 
https://lists.yoctoproject.org/g/meta-virtualization/message/9600
Mute This Topic: https://lists.yoctoproject.org/mt/117911794/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub 
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to