kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4333 from justinsb/bazel_correct_version_stamp 

bazel: expose version as in Makefile
This commit is contained in:
k8s-ci-robot 2018-01-24 08:01:35 -08:00 committed by GitHub
parent 46a6d256d3 c633ab62c5
commit 92d145d354
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -45,6 +45,7 @@ MAKEDIR:=$(strip $(shell dirname "$(realpath $(lastword $(MAKEFILE_LIST)))"))
# Keep in sync with upup/models/cloudup/resources/addons/dns-controller/ # Keep in sync with upup/models/cloudup/resources/addons/dns-controller/
DNS_CONTROLLER_TAG=1.8.0 DNS_CONTROLLER_TAG=1.8.0
# Keep in sync with logic in get_workspace_status
KOPS_RELEASE_VERSION = 1.8.0 KOPS_RELEASE_VERSION = 1.8.0
KOPS_CI_VERSION = 1.8.1-beta.1 KOPS_CI_VERSION = 1.8.1-beta.1
@ -56,6 +57,7 @@ KOPS_ROOT ?= $(patsubst %/,%,$(abspath $(dir $(firstword $(MAKEFILE_LI
GITSHA := $(shell cd ${GOPATH_1ST}/src/k8s.io/kops; git describe --always) GITSHA := $(shell cd ${GOPATH_1ST}/src/k8s.io/kops; git describe --always)
# Keep in sync with logic in get_workspace_status
ifndef VERSION ifndef VERSION
# To keep both CI and end-users building from source happy, # To keep both CI and end-users building from source happy,
# we expect that CI sets CI=1. # we expect that CI sets CI=1.

2
cmd/kops/BUILD.bazel
View File

@ -125,7 +125,7 @@ go_binary(
importpath = "k8s.io/kops/cmd/kops", importpath = "k8s.io/kops/cmd/kops",
visibility = ["//visibility:public"], visibility = ["//visibility:public"],
x_defs = { x_defs = {
"k8s.io/kops.Version": "1.8.0", # keep "k8s.io/kops.Version": "{KOPS_VERSION}", # keep
"k8s.io/kops.GitVersion": "{BUILD_SCM_REVISION}", # keep "k8s.io/kops.GitVersion": "{BUILD_SCM_REVISION}", # keep
}, },
) )

15
tools/get_workspace_status
View File

@ -28,3 +28,18 @@ else
fi fi
echo "BUILD_SCM_STATUS ${tree_status}" echo "BUILD_SCM_STATUS ${tree_status}"
# Compute KOPS_VERSION. Keep in sync with logic in Makefile
GITSHA=$(git describe --always)
KOPS_RELEASE_VERSION=1.8.0
KOPS_CI_VERSION=1.8.1-beta.1
if [[ -z "${VERSION}" ]]; then
if [[ -z "${CI}" ]]; then
VERSION=${KOPS_RELEASE_VERSION}
else
VERSION="${KOPS_CI_VERSION}+${GITSHA}"
fi
fi
echo "KOPS_VERSION ${VERSION}"