From cd75395b168c4b4f51526d9afa8deac78d8c970e Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Fri, 16 Apr 2021 09:32:44 -0400 Subject: 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 --- ....generated_files-Fix-race-issue-for-installi.patch | 19 ++++++++----------- ...1-hack-lib-golang.sh-use-CC-from-environment.patch | 10 +++++----- recipes-containers/kubernetes/kubernetes_git.bb | 8 ++++---- 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 src/import/build/root/Makefile.generated_files | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -diff --git a/src/import/build/root/Makefile.generated_files b/src/import/build/root/Makefile.generated_files -index c8cbf27..e3f1593 100644 ---- a/src/import/build/root/Makefile.generated_files -+++ b/src/import/build/root/Makefile.generated_files -@@ -63,7 +63,9 @@ $(META_DIR)/$(GO_PKGDEPS_FILE): FORCE +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 @@ -40,9 +40,6 @@ index c8cbf27..e3f1593 100644 + 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 \ --- -2.26.2 - + hack/run-in-gopath.sh go2make \ + k8s.io/kubernetes/... \ + --prune k8s.io/kubernetes/staging \ 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 hack/lib/golang.sh | 4 ---- 1 file changed, 4 deletions(-) -Index: kubernetes-v1.20.0-rc.3+git98bc258bf5516b6c60860e06845b899eab29825d/src/import/hack/lib/golang.sh +Index: kubernetes-v1.21.1+git45da3fc33872083fb225c1a8c4d03e530d6f7630/src/import/hack/lib/golang.sh =================================================================== ---- kubernetes-v1.20.0-rc.3+git98bc258bf5516b6c60860e06845b899eab29825d.orig/src/import/hack/lib/golang.sh -+++ kubernetes-v1.20.0-rc.3+git98bc258bf5516b6c60860e06845b899eab29825d/src/import/hack/lib/golang.sh -@@ -400,19 +400,15 @@ - case "${platform}" in +--- kubernetes-v1.21.1+git45da3fc33872083fb225c1a8c4d03e530d6f7630.orig/src/import/hack/lib/golang.sh ++++ kubernetes-v1.21.1+git45da3fc33872083fb225c1a8c4d03e530d6f7630/src/import/hack/lib/golang.sh +@@ -414,19 +414,15 @@ + ;; "linux/arm") export CGO_ENABLED=1 - 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, \ maintenance, and scaling of applications. \ " -PV = "v1.20.4+git${SRCREV_kubernetes}" -SRCREV_kubernetes = "e87da0bd6e03ec3fea7933c4b5263d151aafd07c" -SRCREV_kubernetes-release = "cf1e18a801c2ec6cc8c3d3b83bf1cbc4cf0dbc53" +PV = "v1.21.1+git${SRCREV_kubernetes}" +SRCREV_kubernetes = "45da3fc33872083fb225c1a8c4d03e530d6f7630" +SRCREV_kubernetes-release = "7c1aa83dac555de6f05500911467b70aca4949f0" -SRC_URI = "git://github.com/kubernetes/kubernetes.git;branch=release-1.20;name=kubernetes \ +SRC_URI = "git://github.com/kubernetes/kubernetes.git;branch=release-1.21;name=kubernetes \ git://github.com/kubernetes/release;branch=master;name=kubernetes-release;destsuffix=git/release \ file://0001-hack-lib-golang.sh-use-CC-from-environment.patch \ file://0001-cross-don-t-build-tests-by-default.patch \ -- cgit v1.2.3-54-g00ecf