MIRRORS/meta-virtualization
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-virtualization.git synced 2025-07-19 12:50:22 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

kubernetes: update to 1.24 release

Browse Source 
Bumping to the 1.24 kubernetes release from May 2022.

We refresh one patch, and drop another as the build race looks to be
different (since it is no longer installed seperately).

Otherwise the build is the same, and smoke tests have passed.

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
This commit is contained in:
Bruce Ashfield 2022-05-13 11:07:37 -04:00
parent 420cb45082
commit f1c385030c
3 changed files with 12 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
recipes-containers/kubernetes/kubernetes/0001-Makefile.generated_files-Fix-race-issue-for-installi.patch
View File

@ -1,45 +0,0 @@
From 441df8a24a2c80e320f140b5d9bc352c7ce8a64a Mon Sep 17 00:00:00 2001
From: Robert Yang <liezhi.yang@windriver.com>
Date: Thu, 15 Oct 2020 07:27:35 +0000
Subject: [PATCH] src/import/build/root/Makefile.generated_files: Fix race issue for installing
go2make
The src/import/build/root/Makefile.generated_files are called several times during the build, so the
following target which installs go2make will also run several times:
$(META_DIR)/$(GO_PKGDEPS_FILE): FORCE
It runs automatically when the Makefile is called because of:
sinclude $(META_DIR)/$(GO_PKGDEPS_FILE)
So there is a race issue of go2make when parallel build:
hack/run-in-gopath.sh: line 34: build/tmp-glibc/work/corei7-64-wrs-linux/kubernetes/1.18.8-r0/git/src/import/_output/local/go/bin/go2make: No such file or directory
It is because the first process is using go2make, but then the second process
removes it and reinstall it.
Check whether go2make has been installed or not before install it can fix the
problem.
Upstream-Status: Pending
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
src/import/build/root/Makefile.generated_files | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
Index: kubernetes-v1.21.1+git45da3fc33872083fb225c1a8c4d03e530d6f7630/src/import/build/root/Makefile.generated_files
===================================================================
--- kubernetes-v1.21.1+git45da3fc33872083fb225c1a8c4d03e530d6f7630.orig/src/import/build/root/Makefile.generated_files
+++ kubernetes-v1.21.1+git45da3fc33872083fb225c1a8c4d03e530d6f7630/src/import/build/root/Makefile.generated_files
@@ -67,7 +67,9 @@
if [[ "$(DBG_CODEGEN)" == 1 ]]; then \
echo "DBG: calculating Go dependencies"; \
fi
- hack/run-in-gopath.sh go install ./hack/make-rules/helpers/go2make
+ if [ ! -e _output/local/go/bin/go2make ]; then \
+ hack/run-in-gopath.sh go install ./hack/make-rules/helpers/go2make; \
+ fi
hack/run-in-gopath.sh go2make \
k8s.io/kubernetes/... \
--prune k8s.io/kubernetes/staging \

21
recipes-containers/kubernetes/kubernetes/0001-build-golang.sh-convert-remaining-go-calls-to-use.patch
View File

@ -8,11 +8,11 @@ Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
hack/lib/golang.sh | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/import/hack/lib/golang.sh b/src/import/hack/lib/golang.sh
index e9148ec08fa..71d3c987563 100755
--- a/src/import/hack/lib/golang.sh
+++ b/src/import/hack/lib/golang.sh
@@ -651,7 +651,7 @@ kube::golang::build_some_binaries() {
Index: kubernetes-v1.24.0+git8b1b4db3834ddf7cf1b97137180f413cb9e2186f/src/import/hack/lib/golang.sh
===================================================================
--- kubernetes-v1.24.0+git8b1b4db3834ddf7cf1b97137180f413cb9e2186f.orig/src/import/hack/lib/golang.sh
+++ kubernetes-v1.24.0+git8b1b4db3834ddf7cf1b97137180f413cb9e2186f/src/import/hack/lib/golang.sh
@@ -652,7 +652,7 @@
kube::golang::create_coverage_dummy_test "${package}"
kube::util::trap_add "kube::golang::delete_coverage_dummy_test \"${package}\"" EXIT
@ -21,7 +21,7 @@ index e9148ec08fa..71d3c987563 100755
-covermode count \
-coverpkg k8s.io/...,k8s.io/kubernetes/vendor/k8s.io/... \
"${build_args[@]}" \
@@ -663,13 +663,13 @@ kube::golang::build_some_binaries() {
@@ -664,13 +664,13 @@
done
if [[ "${#uncovered[@]}" != 0 ]]; then
V=2 kube::log::info "Building ${uncovered[*]} without coverage..."
@ -37,15 +37,12 @@ index e9148ec08fa..71d3c987563 100755
fi
}
@@ -725,7 +725,7 @@ kube::golang::build_binaries_for_platform() {
@@ -729,7 +729,7 @@
testpkg=$(dirname "${test}")
mkdir -p "$(dirname "${outfile}")"
- go test -c \
+ $GO test -c \
${goflags:+"${goflags[@]}"} \
-gcflags "${gogcflags:-}" \
-asmflags "${goasmflags:-}" \
--
2.19.1
-gcflags="${gogcflags}" \
-asmflags="${goasmflags}" \

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

@ -5,8 +5,8 @@ applications across multiple hosts, providing basic mechanisms for deployment, \
maintenance, and scaling of applications. \
"
PV = "v1.23.6+git${SRCREV_kubernetes}"
SRCREV_kubernetes = "fbcfa33018159c033aee77b0d5456df6771aa9b5"
PV = "v1.24.0+git${SRCREV_kubernetes}"
SRCREV_kubernetes = "8b1b4db3834ddf7cf1b97137180f413cb9e2186f"
SRCREV_kubernetes-release = "7c1aa83dac555de6f05500911467b70aca4949f0"
PE = "1"
@ -22,14 +22,13 @@ PV:class-devupstream = "v1.23-alpha+git${SRCPV}"
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.24;name=kubernetes;protocol=https \
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://cni-containerd-net.conflist \
file://k8s-init \
file://99-kubernetes.conf \