mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 11:50:44 +00:00
Fix commitFromGit -> gitCommit in release/build-release.sh
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:
parent
3a582c9dbf
commit
4bc1364224
@ -49,7 +49,7 @@ version=$(
|
||||
|
||||
cat << EOF > $MASTER_RELEASE_DIR/src/saltbase/pillar/common.sls
|
||||
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
|
||||
|
||||
function find_go_files() {
|
||||
|
Loading…
Reference in New Issue
Block a user