summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChangqing Li <changqing.li@windriver.com>2025-06-12 13:59:03 +0800
committerBruce Ashfield <bruce.ashfield@gmail.com>2025-06-12 10:40:57 -0400
commitd20e589758ac40a846a8cd22f3b646ef48d02647 (patch)
tree697e3ac085d96455c0609dc983437a3cc4ed4da6
parentecae19b89dc8a3728d18627ef74185b3fb20d694 (diff)
downloadmeta-virtualization-walnascar.tar.gz
kubernetes: rename CNI_NETWORKING_FILESwalnascar
Rename CNI_NETWORKING_FILES to 00_cni-containerd-net.conflist. According to the following k8s doc, k8s networking file will be used when both containerd-cni and kubernetes-cni both installed. "If there are multiple CNI configuration files in the directory, the kubelet uses the configuration file that comes first by name in lexicographic order." This commit can fix following issue: PACKAGE_CLASSES = "package_deb" do_rootfs failed with error: dpkg: error processing archive /path/to/oe-rootfs-repo/corei7-64/./kubernetes-cni_v1.32.0+git0+5fe148234f_release-r0.deb (--unpack): trying to overwrite '/etc/cni/net.d/cni-containerd-net.conflist', which is also in package containerd-cni v2.0.5-r0 Refer [1], "--no-force-overwrite" is set for dpkg, so above error occurred. [1] https://git.openembedded.org/openembedded-core/commit/?id=cb95ba079960411775c57ab864d266e15a6292d1 Signed-off-by: Changqing Li <changqing.li@windriver.com>
-rw-r--r--recipes-containers/kubernetes/kubernetes/00_cni-containerd-net.conflist (renamed from recipes-containers/kubernetes/kubernetes/cni-containerd-net.conflist)0
-rw-r--r--recipes-containers/kubernetes/kubernetes_git.bb4
2 files changed, 2 insertions, 2 deletions
diff --git a/recipes-containers/kubernetes/kubernetes/cni-containerd-net.conflist b/recipes-containers/kubernetes/kubernetes/00_cni-containerd-net.conflist
index ca434d6f..ca434d6f 100644
--- a/recipes-containers/kubernetes/kubernetes/cni-containerd-net.conflist
+++ b/recipes-containers/kubernetes/kubernetes/00_cni-containerd-net.conflist
diff --git a/recipes-containers/kubernetes/kubernetes_git.bb b/recipes-containers/kubernetes/kubernetes_git.bb
index fea48bca..b6eb4946 100644
--- a/recipes-containers/kubernetes/kubernetes_git.bb
+++ b/recipes-containers/kubernetes/kubernetes_git.bb
@@ -31,7 +31,7 @@ SRC_URI:append = " \
31 file://0001-cross-don-t-build-tests-by-default.patch \ 31 file://0001-cross-don-t-build-tests-by-default.patch \
32 file://0001-build-golang.sh-convert-remaining-go-calls-to-use.patch \ 32 file://0001-build-golang.sh-convert-remaining-go-calls-to-use.patch \
33 file://0001-build-hack-allow-go-1.20-building.patch \ 33 file://0001-build-hack-allow-go-1.20-building.patch \
34 file://cni-containerd-net.conflist \ 34 file://00_cni-containerd-net.conflist \
35 file://k8s-init \ 35 file://k8s-init \
36 file://99-kubernetes.conf \ 36 file://99-kubernetes.conf \
37 " 37 "
@@ -119,7 +119,7 @@ do_install() {
119 fi 119 fi
120} 120}
121 121
122CNI_NETWORKING_FILES ?= "${UNPACKDIR}/cni-containerd-net.conflist" 122CNI_NETWORKING_FILES ?= "${UNPACKDIR}/00_cni-containerd-net.conflist"
123 123
124PACKAGES =+ "kubeadm kubectl kubelet kube-proxy ${PN}-misc ${PN}-host" 124PACKAGES =+ "kubeadm kubectl kubelet kube-proxy ${PN}-misc ${PN}-host"
125 125