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

kubernetes: update to 1.23.x series

Browse Source 
Bumbing kubernetes to the latest release branch (now that our go
compiler meets the minium standards).

We also add a networking configuration similar to the k3s one, but
named appropriately so that CNI will read and do basic configuration.

We also add some missing rdepends that were preventing the controller
node from fully initializing.

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
This commit is contained in:
Bruce Ashfield 2021-12-10 09:02:58 -05:00
parent dbd37caa6d
commit ee1e169f0b
2 changed files with 50 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
recipes-containers/kubernetes/kubernetes/cni-containerd-net.conflist Normal file
View File

@ -0,0 +1,24 @@
{
"cniVersion": "0.4.0",
"name": "containerd-net",
"plugins": [
{
"type": "bridge",
"bridge": "cni0",
"isGateway": true,
"ipMasq": true,
"promiscMode": true,
"ipam": {
"type": "host-local",
"subnet": "10.88.0.0/16",
"routes": [
{ "dst": "0.0.0.0/0" }
]
}
},
{
"type": "portmap",
"capabilities": {"portMappings": true}
}
]
}

32
recipes-containers/kubernetes/kubernetes_git.bb
View File

@ -5,15 +5,15 @@ applications across multiple hosts, providing basic mechanisms for deployment, \
maintenance, and scaling of applications. \
"
PV = "v1.22.2+git${SRCREV_kubernetes}"
SRCREV_kubernetes = "a82c1e722590eb1b94f9c7dcba51be67bf37a4e2"
PV = "v1.23.1+git${SRCREV_kubernetes}"
SRCREV_kubernetes = "dd1b0a124713105e94ed58ffc2115ee8c1fd9f72"
SRCREV_kubernetes-release = "7c1aa83dac555de6f05500911467b70aca4949f0"
PE = "1"
BBCLASSEXTEND = "devupstream:target"
LIC_FILES_CHKSUM:class-devupstream = "file://src/import/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
DEFAULT_PREFERENCE:class-devupstream = "-1"
SRC_URI:class-devupstream = "git://github.com/kubernetes/kubernetes.git;branch=master;name=kubernetes;protocol=https \
SRC_URI:classedevupstream = "git://github.com/kubernetes/kubernetes.git;branch=master;name=kubernetes;protocol=https \
git://github.com/kubernetes/release;branch=master;name=kubernetes-release;destsuffix=git/release;protocol=https \
"
SRCREV_kubernetes:class-devupstream = "d2f6eb6339de25cef04850b6d9be8335d52324cd"
@ -22,7 +22,7 @@ PV:class-devupstream = "v1.23-alpha+git${SRCPV}"
SRCREV_FORMAT ?= "kubernetes_release"
SRC_URI = "git://github.com/kubernetes/kubernetes.git;branch=release-1.22;name=kubernetes;protocol=https \
SRC_URI = "git://github.com/kubernetes/kubernetes.git;branch=release-1.23;name=kubernetes;protocol=https \
git://github.com/kubernetes/release;branch=master;name=kubernetes-release;destsuffix=git/release;protocol=https"
SRC_URI:append = " \
@ -30,6 +30,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-Makefile.generated_files-Fix-race-issue-for-installi.patch \
file://cni-containerd-net.conflist \
"
DEPENDS += "rsync-native \
@ -45,6 +46,7 @@ GO_IMPORT = "import"
inherit systemd
inherit go
inherit goarch
inherit cni_networking
COMPATIBLE_HOST = '(x86_64.*|arm.*|aarch64.*)-linux'
@ -100,6 +102,8 @@ do_install() {
install -m 0644 ${WORKDIR}/git/release/cmd/kubepkg/templates/latest/deb/kubeadm/10-kubeadm.conf ${D}${systemd_unitdir}/system/kubelet.service.d/
}
CNI_NETWORKING_FILES ?= "${WORKDIR}/cni-containerd-net.conflist"
PACKAGES =+ "kubeadm kubectl kubelet kube-proxy ${PN}-misc"
ALLOW_EMPTY:${PN} = "1"
@ -111,9 +115,9 @@ INSANE_SKIP:${PN}-misc += "ldflags already-stripped"
RDEPENDS:${PN} += "kubeadm \
kubectl \
kubelet \
cni"
kubernetes-cni"
RDEPENDS:kubeadm = "kubelet kubectl"
RDEPENDS:kubeadm = "kubelet kubectl cri-tools conntrack-tools"
FILES:kubeadm = "${bindir}/kubeadm ${systemd_unitdir}/system/kubelet.service.d/*"
RDEPENDS:kubelet = "iptables socat util-linux ethtool iproute2 ebtables iproute2-tc"
@ -127,5 +131,21 @@ FILES:kubectl = "${bindir}/kubectl"
FILES:kube-proxy = "${bindir}/kube-proxy"
FILES:${PN}-misc = "${bindir}"
RRECOMMENDS:${PN} = "\
kernel-module-xt-addrtype \
kernel-module-xt-nat \
kernel-module-xt-multiport \
kernel-module-xt-conntrack \
kernel-module-xt-comment \
kernel-module-xt-mark \
kernel-module-xt-connmark \
kernel-module-vxlan \
kernel-module-xt-masquerade \
kernel-module-xt-statistic \
kernel-module-xt-physdev \
kernel-module-xt-nflog \
kernel-module-xt-limit \
kernel-module-nfnetlink-log \
"
deltask compile_ptest_base