bf9113ea2e
This replaces the gitcommit() shell function with kube::version_ldflags() which prepares a string suitable for Go's -ldflags parameter that fills in the git version fields in pkg/version/base.go. The gitCommit is now a full 40-character SHA1, the gitVersion will be filled from `git describe` output (which will only be available once we have annotated git tags) and gitTreeState will be filled with either "clean" or "dirty" depending on the tree status at the time of the build. Use a kube:: "namespace" (there's really no such a thing in shell, but the illusion still makes it nice) in order to make this nice to import into existing shell scripts or on a shell session. (In the future, I'm planning to introduce more functions and convert some of the top-level commands into other kube::* shell functions.) There's a difference now that -version will report a full SHA1, this will be improved in a follow up change which will improve the Go code for -version handling to give a more meaningful string that should be enough to identify the origin of the binary in git. Tested: - Built it and checked output of -version: $ hack/build-go.sh $ output/go/bin/kubelet -version Kubernetes version 0.1+, build 3ff7ee4b8c843c7767cd856fbf7d3027cd5410e6 - Ran the release script and checked output of the common.sls file: $ release/build-release.sh TESTINSTANCE $ cat output/release/master-release/src/saltbase/pillar/common.sls instance_prefix: TESTINSTANCE-minion go_opt: -ldflags '-X github.com/GoogleCloudPlatform/kubernetes/pkg/version.gitCommit 3ff7ee4b8c843c7767cd856fbf7d3027cd5410e6 -X github.com/GoogleCloudPlatform/kubernetes/pkg/version.gitTreeState clean' - Successful run of hack/e2e-test.sh end-to-end tests. Signed-off-by: Filipe Brandenburger <filbranden@google.com>
74 lines
2.2 KiB
Bash
Executable File
74 lines
2.2 KiB
Bash
Executable File
#!/bin/bash
|
|
|
|
# Copyright 2014 Google Inc. All rights reserved.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
# This script will build a Kubernetes release tarball
|
|
|
|
# exit on any error
|
|
set -eu
|
|
set -o pipefail
|
|
|
|
SCRIPT_DIR=$(CDPATH="" cd $(dirname $0); pwd)
|
|
|
|
INSTANCE_PREFIX=$1
|
|
|
|
KUBE_DIR=$SCRIPT_DIR/..
|
|
|
|
. "${KUBE_DIR}/hack/config-go.sh"
|
|
|
|
# Next build the release tar. This gets copied on to the master and installed
|
|
# from there. It includes the go source for the necessary servers along with
|
|
# the salt configs.
|
|
rm -rf $KUBE_DIR/output/release/*
|
|
|
|
MASTER_RELEASE_DIR=$KUBE_DIR/output/release/master-release
|
|
mkdir -p $MASTER_RELEASE_DIR/bin
|
|
mkdir -p $MASTER_RELEASE_DIR/src/scripts
|
|
|
|
echo "Building release tree"
|
|
cp $KUBE_DIR/release/master-release-install.sh $MASTER_RELEASE_DIR/src/scripts/master-release-install.sh
|
|
cp -r $KUBE_DIR/cluster/saltbase $MASTER_RELEASE_DIR/src/saltbase
|
|
|
|
# Capture the same version we are using to build the client tools and pass that
|
|
# on.
|
|
version_ldflags=$(kube::version_ldflags)
|
|
|
|
cat << EOF > $MASTER_RELEASE_DIR/src/saltbase/pillar/common.sls
|
|
instance_prefix: $INSTANCE_PREFIX-minion
|
|
go_opt: -ldflags '${version_ldflags}'
|
|
EOF
|
|
|
|
function find_go_files() {
|
|
find * -not \( \
|
|
\( \
|
|
-wholename 'release' \
|
|
-o -wholename 'output' \
|
|
-o -wholename '_output' \
|
|
-o -wholename 'examples' \
|
|
-o -wholename 'test' \
|
|
\) -prune \
|
|
\) -name '*.go'
|
|
}
|
|
# find_go_files is directory dependent
|
|
pushd $KUBE_DIR
|
|
for f in $(find_go_files); do
|
|
mkdir -p $MASTER_RELEASE_DIR/src/go/$(dirname ${f})
|
|
cp ${f} ${MASTER_RELEASE_DIR}/src/go/${f}
|
|
done
|
|
popd
|
|
|
|
echo "Packaging release"
|
|
tar cz -C $KUBE_DIR/output/release -f $KUBE_DIR/output/release/master-release.tgz master-release
|