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 @@
+From 3a43ae2df86f8609d5b88863caf19667420ec171 Mon Sep 17 00:00:00 2001
+From: Bruce Ashfield <bruce.ashfield@gmail.com>
+Date: Fri, 31 Jul 2020 18:39:38 +0000
+Subject: [PATCH] generate-bindata: unset GOBIN
+
+go install is more strict with recent releases and when cross-compiling
+will generate the following error if GOBIN is set:
+
+  | go install: cannot install cross-compiled binaries when GOBIN is set
+  | make[2]: *** [Makefile.generated_files:622: gen_bindata] Error 1
+  | make[1]: *** [Makefile:545: generated_files] Error 2
+  | make: *** [Makefile:506: cross] Error 1
+  | WARNING: exit code 2 from a shell command.
+
+So we explicitly unset GOBIN to avoid the issue.
+
+Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
+---
+ src/import/hack/generate-bindata.sh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/import/hack/generate-bindata.sh b/src/import/hack/generate-bindata.sh
+index c12da77e54b..9a9f8ac3b2f 100755
+--- a/src/import/hack/generate-bindata.sh
++++ b/src/import/hack/generate-bindata.sh
+@@ -33,6 +33,7 @@ export GOBIN="${KUBE_OUTPUT_BINPATH}"
+ PATH="${GOBIN}:${PATH}"
+ 
+ # Install tools we need, but only from vendor/...
++unset GOBIN
+ go install k8s.io/kubernetes/vendor/github.com/go-bindata/go-bindata/go-bindata
+ 
+ # run the generation from the root directory for stable output
+-- 
+2.19.1
+
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, \
 maintenance, and scaling of applications. \
 "
 
-PV = "v1.18.3-beta+git${SRCREV_kubernetes}"
-SRCREV_kubernetes = "fe3ac3e38838a09dfd4b48d568083144211a95f8"
-SRCREV_kubernetes-release = "569a07bc48cf52e25ba4b1f33772b0e1a5999b27"
+PV = "v1.19.0-rc.3+git${SRCREV_kubernetes}"
+SRCREV_kubernetes = "bdc575e10c35a3e65a1c02bceea432832b7e4f4f"
+SRCREV_kubernetes-release = "e7fbf5b8b7e87ed1848cf3a0129f7a7dff2aa4ed"
 
-SRC_URI = "git://github.com/kubernetes/kubernetes.git;branch=release-1.18;name=kubernetes \
+SRC_URI = "git://github.com/kubernetes/kubernetes.git;branch=release-1.19;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 \
+           file://0001-generate-bindata-unset-GOBIN.patch \
           "
 
 DEPENDS += "rsync-native \
@@ -61,9 +62,10 @@ do_compile() {
         export LDFLAGS=""
         export CC="${CC}"
         export LD="${LD}"
+        export GOBIN=""
 
         # to limit what is built, use 'WHAT', i.e. make WHAT=cmd/kubelet
-        make cross KUBE_BUILD_PLATFORMS=${GOOS}/${GOARCH} GOLDFLAGS=""
+        make cross GO=${GO} KUBE_BUILD_PLATFORMS=${GOOS}/${GOARCH} GOLDFLAGS=""
 }
 
 do_install() {