Merge pull request #5367 from justinsb/release_1_10_alpha_1

Mark 1.10.0-alpha.1

Makefile

@@ -53,12 +53,12 @@ unexport KOPS_BASE_URL KOPS_CLUSTER_NAME KOPS_RUN_OBSOLETE_VERSION KOPS_STATE_ST
 unexport SKIP_REGION_CHECK S3_ACCESS_KEY_ID S3_ENDPOINT S3_REGION S3_SECRET_ACCESS_KEY VSPHERE_USERNAME VSPHERE_PASSWORD
 
 # Keep in sync with upup/models/cloudup/resources/addons/dns-controller/
-DNS_CONTROLLER_TAG=1.9.0
+DNS_CONTROLLER_TAG=1.10.0-alpha.1
 
 # Keep in sync with logic in get_workspace_status
-# Update variables in tools/get_workplace_status.sh for the bazel build
-KOPS_RELEASE_VERSION = 1.9.0
-KOPS_CI_VERSION      = 1.9.1-alpha.1
+# TODO: just invoke tools/get_workspace_status.sh?
+KOPS_RELEASE_VERSION:=$(shell grep 'KOPS_RELEASE_VERSION\s*=' version.go | awk '{print $$3}' | sed -e 's_"__g')
+KOPS_CI_VERSION:=$(shell grep 'KOPS_CI_VERSION\s*=' version.go | awk '{print $$3}' | sed -e 's_"__g')
 
 # kops local location
 KOPS                 = ${LOCAL}/kops

tools/get_workspace_status.sh

@@ -47,8 +47,8 @@ GITSHA=$(git describe --always)
 
 # These variables need to match the values in our Makefile
 # When we cut a new release we need to increment these accordingly
-KOPS_RELEASE_VERSION=1.9.0
-KOPS_CI_VERSION=1.9.1-alpha.1
+KOPS_RELEASE_VERSION=`grep 'KOPS_RELEASE_VERSION\s*=' version.go  | awk '{print $3}' | sed -e 's_"__g'`
+KOPS_CI_VERSION=`grep 'KOPS_CI_VERSION\s*=' version.go  |  awk '{print $3}' | sed -e 's_"__g'`
 
 if [[ -z "${VERSION}" ]]; then
   if [[ -z "${CI}" ]]; then

version.go

@@ -18,8 +18,14 @@ package kops
 
 import "strings"
 
-// Version should be replaced by the makefile
-var Version = "1.7.0"
+// Version can be replaced by build tooling
+var Version = KOPS_RELEASE_VERSION
+
+// These constants are parsed by build tooling - be careful about changing the formats
+const (
+	KOPS_RELEASE_VERSION = "1.10.0-alpha.1"
+	KOPS_CI_VERSION      = "1.10.0-alpha.2"
+)
 
 // GitVersion should be replaced by the makefile
 var GitVersion = ""