summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2021-04-16 09:32:44 -0400
committerBruce Ashfield <bruce.ashfield@gmail.com>2021-04-16 09:32:44 -0400
commitcd75395b168c4b4f51526d9afa8deac78d8c970e (patch)
tree1d48b0226327d1681e5e2e9f444d6049bdf3b016
parent77f8a0b4d43d17d983179d6c0ce48b4a270e59ee (diff)
downloadmeta-virtualization-cd75395b168c4b4f51526d9afa8deac78d8c970e.tar.gz
k8s: move to 1.21 release
Updating kubernetes to the 1.21 release. Minor build changes and patch refreshes were required. The changelog is massive, so we won't list it here. Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
-rw-r--r--recipes-containers/kubernetes/kubernetes/0001-Makefile.generated_files-Fix-race-issue-for-installi.patch19
-rw-r--r--recipes-containers/kubernetes/kubernetes/0001-hack-lib-golang.sh-use-CC-from-environment.patch10
-rw-r--r--recipes-containers/kubernetes/kubernetes_git.bb8
3 files changed, 17 insertions, 20 deletions
diff --git a/recipes-containers/kubernetes/kubernetes/0001-Makefile.generated_files-Fix-race-issue-for-installi.patch b/recipes-containers/kubernetes/kubernetes/0001-Makefile.generated_files-Fix-race-issue-for-installi.patch
index 97273e4f..02bb5e91 100644
--- a/recipes-containers/kubernetes/kubernetes/0001-Makefile.generated_files-Fix-race-issue-for-installi.patch
+++ b/recipes-containers/kubernetes/kubernetes/0001-Makefile.generated_files-Fix-race-issue-for-installi.patch
@@ -28,11 +28,11 @@ Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
28 src/import/build/root/Makefile.generated_files | 4 +++- 28 src/import/build/root/Makefile.generated_files | 4 +++-
29 1 file changed, 3 insertions(+), 1 deletion(-) 29 1 file changed, 3 insertions(+), 1 deletion(-)
30 30
31diff --git a/src/import/build/root/Makefile.generated_files b/src/import/build/root/Makefile.generated_files 31Index: kubernetes-v1.21.1+git45da3fc33872083fb225c1a8c4d03e530d6f7630/src/import/build/root/Makefile.generated_files
32index c8cbf27..e3f1593 100644 32===================================================================
33--- a/src/import/build/root/Makefile.generated_files 33--- kubernetes-v1.21.1+git45da3fc33872083fb225c1a8c4d03e530d6f7630.orig/src/import/build/root/Makefile.generated_files
34+++ b/src/import/build/root/Makefile.generated_files 34+++ kubernetes-v1.21.1+git45da3fc33872083fb225c1a8c4d03e530d6f7630/src/import/build/root/Makefile.generated_files
35@@ -63,7 +63,9 @@ $(META_DIR)/$(GO_PKGDEPS_FILE): FORCE 35@@ -67,7 +67,9 @@
36 if [[ "$(DBG_CODEGEN)" == 1 ]]; then \ 36 if [[ "$(DBG_CODEGEN)" == 1 ]]; then \
37 echo "DBG: calculating Go dependencies"; \ 37 echo "DBG: calculating Go dependencies"; \
38 fi 38 fi
@@ -40,9 +40,6 @@ index c8cbf27..e3f1593 100644
40+ if [ ! -e _output/local/go/bin/go2make ]; then \ 40+ if [ ! -e _output/local/go/bin/go2make ]; then \
41+ hack/run-in-gopath.sh go install ./hack/make-rules/helpers/go2make; \ 41+ hack/run-in-gopath.sh go install ./hack/make-rules/helpers/go2make; \
42+ fi 42+ fi
43 hack/run-in-gopath.sh go2make \ 43 hack/run-in-gopath.sh go2make \
44 k8s.io/kubernetes/... \ 44 k8s.io/kubernetes/... \
45 --prune k8s.io/kubernetes/staging \ 45 --prune k8s.io/kubernetes/staging \
46--
472.26.2
48
diff --git a/recipes-containers/kubernetes/kubernetes/0001-hack-lib-golang.sh-use-CC-from-environment.patch b/recipes-containers/kubernetes/kubernetes/0001-hack-lib-golang.sh-use-CC-from-environment.patch
index d27fc25a..3a22a2ef 100644
--- a/recipes-containers/kubernetes/kubernetes/0001-hack-lib-golang.sh-use-CC-from-environment.patch
+++ b/recipes-containers/kubernetes/kubernetes/0001-hack-lib-golang.sh-use-CC-from-environment.patch
@@ -11,12 +11,12 @@ Signed-off-by: Koen Kooi <koen.kooi@linaro.org>
11 hack/lib/golang.sh | 4 ---- 11 hack/lib/golang.sh | 4 ----
12 1 file changed, 4 deletions(-) 12 1 file changed, 4 deletions(-)
13 13
14Index: kubernetes-v1.20.0-rc.3+git98bc258bf5516b6c60860e06845b899eab29825d/src/import/hack/lib/golang.sh 14Index: kubernetes-v1.21.1+git45da3fc33872083fb225c1a8c4d03e530d6f7630/src/import/hack/lib/golang.sh
15=================================================================== 15===================================================================
16--- kubernetes-v1.20.0-rc.3+git98bc258bf5516b6c60860e06845b899eab29825d.orig/src/import/hack/lib/golang.sh 16--- kubernetes-v1.21.1+git45da3fc33872083fb225c1a8c4d03e530d6f7630.orig/src/import/hack/lib/golang.sh
17+++ kubernetes-v1.20.0-rc.3+git98bc258bf5516b6c60860e06845b899eab29825d/src/import/hack/lib/golang.sh 17+++ kubernetes-v1.21.1+git45da3fc33872083fb225c1a8c4d03e530d6f7630/src/import/hack/lib/golang.sh
18@@ -400,19 +400,15 @@ 18@@ -414,19 +414,15 @@
19 case "${platform}" in 19 ;;
20 "linux/arm") 20 "linux/arm")
21 export CGO_ENABLED=1 21 export CGO_ENABLED=1
22- export CC=${KUBE_LINUX_ARM_CC:-arm-linux-gnueabihf-gcc} 22- export CC=${KUBE_LINUX_ARM_CC:-arm-linux-gnueabihf-gcc}
diff --git a/recipes-containers/kubernetes/kubernetes_git.bb b/recipes-containers/kubernetes/kubernetes_git.bb
index bc694a27..372c6dab 100644
--- a/recipes-containers/kubernetes/kubernetes_git.bb
+++ b/recipes-containers/kubernetes/kubernetes_git.bb
@@ -5,11 +5,11 @@ 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.20.4+git${SRCREV_kubernetes}" 8PV = "v1.21.1+git${SRCREV_kubernetes}"
9SRCREV_kubernetes = "e87da0bd6e03ec3fea7933c4b5263d151aafd07c" 9SRCREV_kubernetes = "45da3fc33872083fb225c1a8c4d03e530d6f7630"
10SRCREV_kubernetes-release = "cf1e18a801c2ec6cc8c3d3b83bf1cbc4cf0dbc53" 10SRCREV_kubernetes-release = "7c1aa83dac555de6f05500911467b70aca4949f0"
11 11
12SRC_URI = "git://github.com/kubernetes/kubernetes.git;branch=release-1.20;name=kubernetes \ 12SRC_URI = "git://github.com/kubernetes/kubernetes.git;branch=release-1.21;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 \