diff options
Diffstat (limited to 'recipes-containers/kubernetes/kubernetes_git.bb')
| -rw-r--r-- | recipes-containers/kubernetes/kubernetes_git.bb | 55 |
1 files changed, 31 insertions, 24 deletions
diff --git a/recipes-containers/kubernetes/kubernetes_git.bb b/recipes-containers/kubernetes/kubernetes_git.bb index 41d01927..caa5ec17 100644 --- a/recipes-containers/kubernetes/kubernetes_git.bb +++ b/recipes-containers/kubernetes/kubernetes_git.bb @@ -5,31 +5,32 @@ applications across multiple hosts, providing basic mechanisms for deployment, \ maintenance, and scaling of applications. \ " -PV = "v1.23.2+git${SRCREV_kubernetes}" -SRCREV_kubernetes = "fa546d8cc76fe7c07c538d55efd2e6dd4ec919a5" -SRCREV_kubernetes-release = "7c1aa83dac555de6f05500911467b70aca4949f0" +PV = "v1.29.1+git${SRCREV_kubernetes}" +CVE_VERSION = "1.29.1" +SRCREV_kubernetes = "a02da633101bd7919153dd56412b09221c0139bf" +SRCREV_kubernetes-release = "21382abdbfa8e6a43fd417306fa649cb651cc06e" PE = "1" BBCLASSEXTEND = "devupstream:target" -LIC_FILES_CHKSUM:class-devupstream = "file://src/import/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" +LIC_FILES_CHKSUM:class-devupstream = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" DEFAULT_PREFERENCE:class-devupstream = "-1" -SRC_URI:classedevupstream = "git://github.com/kubernetes/kubernetes.git;branch=master;name=kubernetes;protocol=https \ +SRC_URI:class-devupstream = "git://github.com/kubernetes/kubernetes.git;branch=release-1.29;name=kubernetes;protocol=https \ git://github.com/kubernetes/release;branch=master;name=kubernetes-release;destsuffix=git/release;protocol=https \ " -SRCREV_kubernetes:class-devupstream = "d2f6eb6339de25cef04850b6d9be8335d52324cd" -SRCREV_kubernetes-release:class-devupstream = "7c1aa83dac555de6f05500911467b70aca4949f0" -PV:class-devupstream = "v1.23-alpha+git${SRCPV}" +SRCREV_kubernetes:class-devupstream = "e3b5e621f07f0fee298f641ebded61b8f393fe27" +SRCREV_kubernetes-release:class-devupstream = "21382abdbfa8e6a43fd417306fa649cb651cc06e" +PV:class-devupstream = "v1.28.2+git${SRCREV_kubernetes}" SRCREV_FORMAT ?= "kubernetes_release" -SRC_URI = "git://github.com/kubernetes/kubernetes.git;branch=release-1.23;name=kubernetes;protocol=https \ +SRC_URI = "git://github.com/kubernetes/kubernetes.git;branch=release-1.29;name=kubernetes;protocol=https;destsuffix=git/src/github.com/kubernetes/kubernetes \ git://github.com/kubernetes/release;branch=master;name=kubernetes-release;destsuffix=git/release;protocol=https" SRC_URI:append = " \ file://0001-hack-lib-golang.sh-use-CC-from-environment.patch \ 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://0001-build-hack-allow-go-1.20-building.patch \ file://cni-containerd-net.conflist \ file://k8s-init \ file://99-kubernetes.conf \ @@ -41,9 +42,10 @@ DEPENDS += "rsync-native \ " LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" GO_IMPORT = "import" +S = "${WORKDIR}/git/src/github.com/kubernetes/kubernetes" inherit systemd inherit go @@ -53,12 +55,8 @@ inherit cni_networking COMPATIBLE_HOST = '(x86_64.*|arm.*|aarch64.*)-linux' do_compile() { - # link fixups for compilation - rm -f ${S}/src/import/vendor/src - ln -sf ./ ${S}/src/import/vendor/src - - export GOPATH="${S}/src/import/.gopath:${S}/src/import/vendor:${STAGING_DIR_TARGET}/${prefix}/local/go" - cd ${S}/src/import + export GOPATH="${S}/src/import/.gopath:${S}/src/import/vendor:${STAGING_DIR_TARGET}/${prefix}/local/go:${WORKDIR}/git/" + cd ${S} # Build the host tools first, using the host compiler export GOARCH="${BUILD_GOARCH}" @@ -73,7 +71,15 @@ do_compile() { export CC="${BUILD_CC}" export LD="${BUILD_LD}" - make generated_files GO="go" KUBE_BUILD_PLATFORMS="${HOST_GOOS}/${BUILD_GOARCH}" + # set the toolchain to local to avoid an attempted fetch of + # valiation by the build + # https://github.com/actions/setup-go/issues/420 + export GOTOOLCHAIN="local" + + # make generated_files GO="go" KUBE_BUILD_PLATFORMS="${HOST_GOOS}/${BUILD_GOARCH}" + # is replaced by: + # ./hack/update-codegen.sh + # but we don't appear to need either anymore, but we leave them as a placeholder/reminder # Build the target binaries export GOARCH="${TARGET_GOARCH}" @@ -88,7 +94,7 @@ do_compile() { export GOBIN="" # to limit what is built, use 'WHAT', i.e. make WHAT=cmd/kubelet - make cross CGO_FLAGS=${CGO_FLAGS} GO=${GO} KUBE_BUILD_PLATFORMS=${GOOS}/${GOARCH} GOLDFLAGS="" + make cross CGO_FLAGS=${CGO_FLAGS} GO=${GO} KUBE_BUILD_PLATFORMS=${GOOS}/${GOARCH} GOLDFLAGS="" DBG=1 } do_install() { @@ -98,14 +104,14 @@ do_install() { install -d ${D}${sysconfdir}/kubernetes/manifests/ - install -m 755 -D ${S}/src/import/_output/local/bin/${TARGET_GOOS}/${TARGET_GOARCH}/* ${D}/${bindir} + install -m 755 -D ${S}/_output/local/bin/${TARGET_GOOS}/${TARGET_GOARCH}/* ${D}/${bindir} install -m 0644 ${WORKDIR}/git/release/cmd/kubepkg/templates/latest/deb/kubelet/lib/systemd/system/kubelet.service ${D}${systemd_unitdir}/system/ install -m 0644 ${WORKDIR}/git/release/cmd/kubepkg/templates/latest/deb/kubeadm/10-kubeadm.conf ${D}${systemd_unitdir}/system/kubelet.service.d/ if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - install -d "${D}${BIN_PREFIX}/bin" - install -m 755 "${WORKDIR}/k8s-init" "${D}${BIN_PREFIX}/bin" + install -d "${D}${BIN_PREFIX}${base_bindir}" + install -m 755 "${WORKDIR}/k8s-init" "${D}${BIN_PREFIX}${base_bindir}" install -d ${D}${sysconfdir}/sysctl.d install -m 0644 "${WORKDIR}/99-kubernetes.conf" "${D}${sysconfdir}/sysctl.d" @@ -118,7 +124,8 @@ PACKAGES =+ "kubeadm kubectl kubelet kube-proxy ${PN}-misc ${PN}-host" ALLOW_EMPTY:${PN} = "1" INSANE_SKIP:${PN} += "ldflags already-stripped" -INSANE_SKIP:${PN}-misc += "ldflags already-stripped" +INSANE_SKIP:${PN}-misc += "ldflags already-stripped textrel" +INSANE_SKIP:kubelet += "ldflags already-stripped" # Note: we are explicitly *not* adding docker to the rdepends, since we allow # backends like cri-o to be used. @@ -142,7 +149,7 @@ FILES:kube-proxy = "${bindir}/kube-proxy" FILES:${PN}-misc = "${bindir} ${sysconfdir}/sysctl.d" ALLOW_EMPTY:${PN}-host = "1" -FILE:${PN}-host = "${BIN_PREFIX}/bin/k8s-init" +FILES:${PN}-host = "${BIN_PREFIX}${base_bindir}/k8s-init" RDEPENDS:${PN}-host = "${PN}" RRECOMMENDS:${PN} = "\ |