2 files changed, 2 insertions, 39 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
deleted file mode 100644
index 95196efa..00000000
--- a/recipes-containers/kubernetes/kubernetes/0001-generate-bindata-unset-GOBIN.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-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 e770e423..94af351f 100644
--- a/recipes-containers/kubernetes/kubernetes_git.bb
+++ b/recipes-containers/kubernetes/kubernetes_git.bb
@@ -5,15 +5,14 @@ applications across multiple hosts, providing basic mechanisms for deployment, \
 maintenance, and scaling of applications. \
 "
 
-PV = "v1.22-alpha+git${SRCREV_kubernetes}"
-SRCREV_kubernetes = "7229ea343dd649f9a6c20fa1fd6b13e602f3f082"
+PV = "v1.22-beta+git${SRCREV_kubernetes}"
+SRCREV_kubernetes = "b289fbb03dee455fd44689d483333e49a1795438"
 SRCREV_kubernetes-release = "7c1aa83dac555de6f05500911467b70aca4949f0"
 
 SRC_URI = "git://github.com/kubernetes/kubernetes.git;branch=master;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 \
            file://0001-build-golang.sh-convert-remaining-go-calls-to-use.patch \
            file://0001-Makefile.generated_files-Fix-race-issue-for-installi.patch \
           "