summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2020-07-31 14:44:34 +0000
committerBruce Ashfield <bruce.ashfield@gmail.com>2020-07-31 19:01:25 +0000
commit00b472ca437262bd7fc150b522014e31e5ed0cbd (patch)
treef5548014b18944cccfc18aa156a3fc74954e3fd0
parent65c40e6e57c92200160125a0776d88a64c1bf912 (diff)
downloadmeta-virtualization-00b472ca437262bd7fc150b522014e31e5ed0cbd.tar.gz
kubernetes: update to release 1.19-rc3
In preparation for the fall release, update to the 1.19 release branch of kubernetes, so that the change can soak and we can work through the rc's No unexpected build or patch issues with this bump and basic sanity testing passed. Once ore components are updated, extended testig will occur. Sanity built and tested on x86-64 and arm64 Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
-rw-r--r--recipes-containers/kubernetes/kubernetes/0001-generate-bindata-unset-GOBIN.patch36
-rw-r--r--recipes-containers/kubernetes/kubernetes_git.bb12
2 files changed, 43 insertions, 5 deletions
diff --git a/recipes-containers/kubernetes/kubernetes/0001-generate-bindata-unset-GOBIN.patch b/recipes-containers/kubernetes/kubernetes/0001-generate-bindata-unset-GOBIN.patch
new file mode 100644
index 00000000..95196efa
--- /dev/null
+++ b/recipes-containers/kubernetes/kubernetes/0001-generate-bindata-unset-GOBIN.patch
@@ -0,0 +1,36 @@
1From 3a43ae2df86f8609d5b88863caf19667420ec171 Mon Sep 17 00:00:00 2001
2From: Bruce Ashfield <bruce.ashfield@gmail.com>
3Date: Fri, 31 Jul 2020 18:39:38 +0000
4Subject: [PATCH] generate-bindata: unset GOBIN
5
6go install is more strict with recent releases and when cross-compiling
7will generate the following error if GOBIN is set:
8
9 | go install: cannot install cross-compiled binaries when GOBIN is set
10 | make[2]: *** [Makefile.generated_files:622: gen_bindata] Error 1
11 | make[1]: *** [Makefile:545: generated_files] Error 2
12 | make: *** [Makefile:506: cross] Error 1
13 | WARNING: exit code 2 from a shell command.
14
15So we explicitly unset GOBIN to avoid the issue.
16
17Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
18---
19 src/import/hack/generate-bindata.sh | 1 +
20 1 file changed, 1 insertion(+)
21
22diff --git a/src/import/hack/generate-bindata.sh b/src/import/hack/generate-bindata.sh
23index c12da77e54b..9a9f8ac3b2f 100755
24--- a/src/import/hack/generate-bindata.sh
25+++ b/src/import/hack/generate-bindata.sh
26@@ -33,6 +33,7 @@ export GOBIN="${KUBE_OUTPUT_BINPATH}"
27 PATH="${GOBIN}:${PATH}"
28
29 # Install tools we need, but only from vendor/...
30+unset GOBIN
31 go install k8s.io/kubernetes/vendor/github.com/go-bindata/go-bindata/go-bindata
32
33 # run the generation from the root directory for stable output
34--
352.19.1
36
diff --git a/recipes-containers/kubernetes/kubernetes_git.bb b/recipes-containers/kubernetes/kubernetes_git.bb
index d28e6a25..2cc2bcdf 100644
--- a/recipes-containers/kubernetes/kubernetes_git.bb
+++ b/recipes-containers/kubernetes/kubernetes_git.bb
@@ -5,14 +5,15 @@ applications across multiple hosts, providing basic mechanisms for deployment, \
5maintenance, and scaling of applications. \ 5maintenance, and scaling of applications. \
6" 6"
7 7
8PV = "v1.18.3-beta+git${SRCREV_kubernetes}" 8PV = "v1.19.0-rc.3+git${SRCREV_kubernetes}"
9SRCREV_kubernetes = "fe3ac3e38838a09dfd4b48d568083144211a95f8" 9SRCREV_kubernetes = "bdc575e10c35a3e65a1c02bceea432832b7e4f4f"
10SRCREV_kubernetes-release = "569a07bc48cf52e25ba4b1f33772b0e1a5999b27" 10SRCREV_kubernetes-release = "e7fbf5b8b7e87ed1848cf3a0129f7a7dff2aa4ed"
11 11
12SRC_URI = "git://github.com/kubernetes/kubernetes.git;branch=release-1.18;name=kubernetes \ 12SRC_URI = "git://github.com/kubernetes/kubernetes.git;branch=release-1.19;name=kubernetes \
13 git://github.com/kubernetes/release;branch=master;name=kubernetes-release;destsuffix=git/release \ 13 git://github.com/kubernetes/release;branch=master;name=kubernetes-release;destsuffix=git/release \
14 file://0001-hack-lib-golang.sh-use-CC-from-environment.patch \ 14 file://0001-hack-lib-golang.sh-use-CC-from-environment.patch \
15 file://0001-cross-don-t-build-tests-by-default.patch \ 15 file://0001-cross-don-t-build-tests-by-default.patch \
16 file://0001-generate-bindata-unset-GOBIN.patch \
16 " 17 "
17 18
18DEPENDS += "rsync-native \ 19DEPENDS += "rsync-native \
@@ -61,9 +62,10 @@ do_compile() {
61 export LDFLAGS="" 62 export LDFLAGS=""
62 export CC="${CC}" 63 export CC="${CC}"
63 export LD="${LD}" 64 export LD="${LD}"
65 export GOBIN=""
64 66
65 # to limit what is built, use 'WHAT', i.e. make WHAT=cmd/kubelet 67 # to limit what is built, use 'WHAT', i.e. make WHAT=cmd/kubelet
66 make cross KUBE_BUILD_PLATFORMS=${GOOS}/${GOARCH} GOLDFLAGS="" 68 make cross GO=${GO} KUBE_BUILD_PLATFORMS=${GOOS}/${GOARCH} GOLDFLAGS=""
67} 69}
68 70
69do_install() { 71do_install() {