mirror of
git://git.yoctoproject.org/meta-virtualization.git
synced 2025-07-04 21:05:25 +02:00
kubernetes: rename CNI_NETWORKING_FILES
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>
This commit is contained in:
parent
a8175deded
commit
0115e61cdd
|
@ -31,7 +31,7 @@ SRC_URI:append = " \
|
|||
file://0001-cross-don-t-build-tests-by-default.patch \
|
||||
file://0001-build-golang.sh-convert-remaining-go-calls-to-use.patch \
|
||||
file://0001-build-hack-allow-go-1.20-building.patch \
|
||||
file://cni-containerd-net.conflist \
|
||||
file://00_cni-containerd-net.conflist \
|
||||
file://k8s-init \
|
||||
file://99-kubernetes.conf \
|
||||
"
|
||||
|
@ -119,7 +119,7 @@ do_install() {
|
|||
fi
|
||||
}
|
||||
|
||||
CNI_NETWORKING_FILES ?= "${UNPACKDIR}/cni-containerd-net.conflist"
|
||||
CNI_NETWORKING_FILES ?= "${UNPACKDIR}/00_cni-containerd-net.conflist"
|
||||
|
||||
PACKAGES =+ "kubeadm kubectl kubelet kube-proxy ${PN}-misc ${PN}-host"
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user