From 933da2c86d229ff028b8cba216558363e0501f3d Mon Sep 17 00:00:00 2001 From: Matt Rickard Date: Tue, 29 Nov 2016 11:55:49 -0800 Subject: [PATCH] Add localkube releasing jobs to makefile Update releases to reflect v1.5.0-beta.1 --- Makefile | 13 +++++++++++++ deploy/minikube/k8s_releases.json | 8 +------- hack/get_k8s_version.py | 2 ++ 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 49b5f61c7e..3d9ae81367 100644 --- a/Makefile +++ b/Makefile @@ -42,6 +42,9 @@ export GOPATH PYTHON := $(shell command -v python || echo "docker run --rm -it -v $(shell pwd):/minikube -w /minikube python python") BUILD_OS := $(shell uname -s) +LOCALKUBE_VERSION := $(shell $(PYTHON) hack/get_k8s_version.py --k8s-version-only 2>&1) +LOCALKUBE_BUCKET := gs://minikube/k8sReleases + # Set the version information for the Kubernetes servers, and build localkube statically K8S_VERSION_LDFLAGS := $(shell $(PYTHON) hack/get_k8s_version.py 2>&1) MINIKUBE_LDFLAGS := -X k8s.io/minikube/pkg/version.version=$(VERSION) @@ -156,3 +159,13 @@ $(GOPATH)/src/$(ORG): .PHONY: check-release check-release: go test -v ./deploy/minikube/release_sanity_test.go -tags=release + +.PHONY: release-localkube +release-localkube: out/localkube checksum + gsutil cp out/localkube $(LOCALKUBE_BUCKET)/$(LOCALKUBE_VERSION)/localkube-linux-amd64 + gsutil cp out/localkube.sha256 $(LOCALKUBE_BUCKET)/$(LOCALKUBE_VERSION)/localkube-linux-amd64.sha256 + +.PHONY: update-releases +update-releases: + gsutil cp deploy/minikube/k8s_releases.json gs://minikube/k8s_releases.json + diff --git a/deploy/minikube/k8s_releases.json b/deploy/minikube/k8s_releases.json index f00810564d..75d4fd9ff7 100644 --- a/deploy/minikube/k8s_releases.json +++ b/deploy/minikube/k8s_releases.json @@ -1,12 +1,6 @@ [ { - "version": "v1.5.0-alpha.2" - }, - { - "version": "v1.5.0-alpha.1" - }, - { - "version": "v1.5.0-alpha.0" + "version": "v1.5.0-beta.1" }, { "version": "v1.4.5" diff --git a/hack/get_k8s_version.py b/hack/get_k8s_version.py index 3ccd42d955..9fc986f68b 100644 --- a/hack/get_k8s_version.py +++ b/hack/get_k8s_version.py @@ -45,6 +45,8 @@ def get_tree_state(): return 'gitTreeState=%s' % result def main(): + if len(sys.argv) > 1 and sys.argv[1] == "--k8s-version-only": + return get_from_godep('Comment') args = [get_rev(), get_version(), get_tree_state()] return ' '.join([X_ARG_BASE + arg for arg in args])