Merge 10db7eafa1 into 4d7c681ba0

10 years ago · a285bf4a4c
parent 4d7c681ba0 10db7eafa1
commit a285bf4a4c
3 changed files with 3 additions and 3 deletions
--- a/rootfs/include.mk
+++ b/rootfs/include.mk
@ -83,6 +83,6 @@ binary:
 kubectl:
 ifeq ("$(wildcard bin/$(KUBE_VERSION))", "")
 	touch bin/$(KUBE_VERSION)
-	curl -fsSL -o bin/kubectl https://storage.googleapis.com/kubernetes-release/release/${KUBE_VERSION}/bin/linux/386/kubectl
+	curl -fsSL -o bin/kubectl https://storage.googleapis.com/kubernetes-release/release/${KUBE_VERSION}/bin/linux/amd64/kubectl
 	chmod +x bin/kubectl
 endif
--- a/rootfs/manager/Makefile
+++ b/rootfs/manager/Makefile
@ -13,7 +13,7 @@
 # limitations under the License.

 IMAGE ?= manager
-KUBE_VERSION ?= v1.1.7
+KUBE_VERSION ?= v1.2.0

 include ../include.mk

--- a/rootfs/resourcifier/Makefile
+++ b/rootfs/resourcifier/Makefile
@ -13,7 +13,7 @@
 # limitations under the License.

 IMAGE ?= resourcifier
-KUBE_VERSION ?= v1.1.7
+KUBE_VERSION ?= v1.2.0

 include ../include.mk