scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-03 19:58:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix commitFromGit -> gitCommit in release/build-release.sh

Browse Source 
This caused Jenkins break on e2e-test because the version of server and
client did not match exactly, as the server was built without the
version ldflags.

Tested:
- Ran "release/build-release.sh ${instance_name}" and confirmed that
  output/release/master-release/src/saltbase/pillar/common.sls has the
  git version under version.gitCommit no longer version.commitFromGit.

Fixes: b777eb19e2
This commit is contained in:
Filipe Brandenburger
2014-08-27 14:04:54 -07:00
parent 3a582c9dbf
commit 4bc1364224
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
release/build-release.sh
View File

@@ -49,7 +49,7 @@ version=$(
cat << EOF > $MASTER_RELEASE_DIR/src/saltbase/pillar/common.sls cat << EOF > $MASTER_RELEASE_DIR/src/saltbase/pillar/common.sls
instance_prefix: $INSTANCE_PREFIX-minion instance_prefix: $INSTANCE_PREFIX-minion
go_opt: -ldflags "-X github.com/GoogleCloudPlatform/kubernetes/pkg/version.commitFromGit '$version'" go_opt: -ldflags "-X github.com/GoogleCloudPlatform/kubernetes/pkg/version.gitCommit '$version'"
EOF EOF
function find_go_files() { function find_go_files() {