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 v1.27.x-rc

Browse Source 
Bumping kubernetes to the next release candidate (april 2023).

We refresh our $GO patch, drop the need to do release artifacts
preparation and add a new INSANE_SKIP for kubelet.

But otherwise, the build and content the same or similar.

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
This commit is contained in:
Bruce Ashfield 2023-03-27 20:28:24 -04:00
parent c5f7a698bc
commit 8fcd817417
2 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,11 +10,11 @@ Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
hack/lib/golang.sh | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
Index: kubernetes-v1.24.0+git8b1b4db3834ddf7cf1b97137180f413cb9e2186f/hack/lib/golang.sh
Index: kubernetes/hack/lib/golang.sh
===================================================================
--- kubernetes-v1.24.0+git8b1b4db3834ddf7cf1b97137180f413cb9e2186f.orig/hack/lib/golang.sh
+++ kubernetes-v1.24.0+git8b1b4db3834ddf7cf1b97137180f413cb9e2186f/hack/lib/golang.sh
@@ -652,7 +652,7 @@
--- kubernetes.orig/hack/lib/golang.sh
+++ kubernetes/hack/lib/golang.sh
@@ -689,7 +689,7 @@
kube::golang::create_coverage_dummy_test "${package}"
kube::util::trap_add "kube::golang::delete_coverage_dummy_test \"${package}\"" EXIT
@ -23,23 +23,23 @@ Index: kubernetes-v1.24.0+git8b1b4db3834ddf7cf1b97137180f413cb9e2186f/hack/lib/g
-covermode count \
-coverpkg k8s.io/...,k8s.io/kubernetes/vendor/k8s.io/... \
"${build_args[@]}" \
@@ -664,13 +664,13 @@
@@ -701,13 +701,13 @@
done
if [[ "${#uncovered[@]}" != 0 ]]; then
V=2 kube::log::info "Building ${uncovered[*]} without coverage..."
- go install "${build_args[@]}" "${uncovered[@]}"
+ $GO install "${build_args[@]}" "${uncovered[@]}"
- GO111MODULE=on GOPROXY=off go install "${build_args[@]}" "${uncovered[@]}"
+ GO111MODULE=on GOPROXY=off $GO install "${build_args[@]}" "${uncovered[@]}"
else
V=2 kube::log::info "Nothing to build without coverage."
fi
else
V=2 kube::log::info "Coverage is disabled."
- go install "${build_args[@]}" "$@"
+ $GO install "${build_args[@]}" "$@"
- GO111MODULE=on GOPROXY=off go install "${build_args[@]}" "$@"
+ GO111MODULE=on GOPROXY=off $GO install "${build_args[@]}" "$@"
fi
}
@@ -729,7 +729,7 @@
@@ -769,7 +769,7 @@
testpkg=$(dirname "${test}")
mkdir -p "$(dirname "${outfile}")"

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

@ -5,9 +5,9 @@ applications across multiple hosts, providing basic mechanisms for deployment, \
maintenance, and scaling of applications. \
"
PV = "v1.24.0+git${SRCREV_kubernetes}"
SRCREV_kubernetes = "8b1b4db3834ddf7cf1b97137180f413cb9e2186f"
SRCREV_kubernetes-release = "7c1aa83dac555de6f05500911467b70aca4949f0"
PV = "v1.27.0-rc+git${SRCREV_kubernetes}"
SRCREV_kubernetes = "bcd6658c10cdf42a9eea1748b8742e8995b55ca7"
SRCREV_kubernetes-release = "21382abdbfa8e6a43fd417306fa649cb651cc06e"
PE = "1"
BBCLASSEXTEND = "devupstream:target"
@ -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.24;name=kubernetes;protocol=https;destsuffix=git/src/github.com/kubernetes/kubernetes \
SRC_URI = "git://github.com/kubernetes/kubernetes.git;branch=release-1.27;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 = " \
@ -69,7 +69,10 @@ do_compile() {
export CC="${BUILD_CC}"
export LD="${BUILD_LD}"
make generated_files GO="go" KUBE_BUILD_PLATFORMS="${HOST_GOOS}/${BUILD_GOARCH}"
# 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}"
@ -115,6 +118,7 @@ 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 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.