github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-01 07:47:56 +00:00
Code Issues Projects Releases Wiki Activity

fix hack/lib/version.sh shellcheck failures

Browse Source
This commit is contained in:
Benjamin Elder 2019-06-23 19:13:25 -07:00
parent 9b4b5098e1
commit 59c4eb2a38
2 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hack/.shellcheck_failures
View File

@ -18,7 +18,6 @@
./cluster/test-e2e.sh ./cluster/test-e2e.sh
./cluster/validate-cluster.sh ./cluster/validate-cluster.sh
./hack/lib/test.sh ./hack/lib/test.sh
./hack/lib/version.sh
./hack/test-integration.sh ./hack/test-integration.sh
./hack/verify-test-featuregates.sh ./hack/verify-test-featuregates.sh
./test/cmd/diff.sh ./test/cmd/diff.sh

47
hack/lib/version.sh
View File

@ -39,6 +39,9 @@ kube::version::get_version_vars() {
# If the kubernetes source was exported through git archive, then # If the kubernetes source was exported through git archive, then
# we likely don't have a git tree, but these magic values may be filled in. # we likely don't have a git tree, but these magic values may be filled in.
# shellcheck disable=SC2016,SC2050
# Disabled as we're not expanding these at runtime, but rather expecting
# that another tool may have expanded these and rewritten the source (!)
if [[ '$Format:%%$' == "%" ]]; then if [[ '$Format:%%$' == "%" ]]; then
KUBE_GIT_COMMIT='$Format:%H$' KUBE_GIT_COMMIT='$Format:%H$'
KUBE_GIT_TREE_STATE="archive" KUBE_GIT_TREE_STATE="archive"
@ -70,11 +73,17 @@ kube::version::get_version_vars() {
# #
# TODO: We continue calling this "git version" because so many # TODO: We continue calling this "git version" because so many
# downstream consumers are expecting it there. # downstream consumers are expecting it there.
#
# These regexes are painful enough in sed...
# We don't want to do them in pure shell, so disable SC2001
# shellcheck disable=SC2001
DASHES_IN_VERSION=$(echo "${KUBE_GIT_VERSION}" | sed "s/[^-]//g") DASHES_IN_VERSION=$(echo "${KUBE_GIT_VERSION}" | sed "s/[^-]//g")
if [[ "${DASHES_IN_VERSION}" == "---" ]] ; then if [[ "${DASHES_IN_VERSION}" == "---" ]] ; then
# shellcheck disable=SC2001
# We have distance to subversion (v1.1.0-subversion-1-gCommitHash) # We have distance to subversion (v1.1.0-subversion-1-gCommitHash)
KUBE_GIT_VERSION=$(echo "${KUBE_GIT_VERSION}" | sed "s/-\([0-9]\{1,\}\)-g\([0-9a-f]\{14\}\)$/.\1\+\2/") KUBE_GIT_VERSION=$(echo "${KUBE_GIT_VERSION}" | sed "s/-\([0-9]\{1,\}\)-g\([0-9a-f]\{14\}\)$/.\1\+\2/")
elif [[ "${DASHES_IN_VERSION}" == "--" ]] ; then elif [[ "${DASHES_IN_VERSION}" == "--" ]] ; then
# shellcheck disable=SC2001
# We have distance to base tag (v1.1.0-1-gCommitHash) # We have distance to base tag (v1.1.0-1-gCommitHash)
KUBE_GIT_VERSION=$(echo "${KUBE_GIT_VERSION}" | sed "s/-g\([0-9a-f]\{14\}\)$/+\1/") KUBE_GIT_VERSION=$(echo "${KUBE_GIT_VERSION}" | sed "s/-g\([0-9a-f]\{14\}\)$/+\1/")
fi fi
@ -135,16 +144,6 @@ kube::version::load_version_vars() {
source "${version_file}" source "${version_file}"
} }
kube::version::ldflag() {
local key=${1}
local val=${2}
# If you update these, also update the list pkg/version/def.bzl.
echo "-X '${KUBE_GO_PACKAGE}/pkg/version.${key}=${val}'"
echo "-X '${KUBE_GO_PACKAGE}/vendor/k8s.io/client-go/pkg/version.${key}=${val}'"
echo "-X '${KUBE_GO_PACKAGE}/pkg/kubectl/version.${key}=${val}'"
}
# Prints the value that needs to be passed to the -ldflags parameter of go build # Prints the value that needs to be passed to the -ldflags parameter of go build
# in order to set the Kubernetes based on the git tree status. # in order to set the Kubernetes based on the git tree status.
# IMPORTANT: if you update any of these, also update the lists in # IMPORTANT: if you update any of these, also update the lists in
@ -152,23 +151,31 @@ kube::version::ldflag() {
kube::version::ldflags() { kube::version::ldflags() {
kube::version::get_version_vars kube::version::get_version_vars
local buildDate= local -a ldflags
[[ -z ${SOURCE_DATE_EPOCH-} ]] || buildDate="--date=@${SOURCE_DATE_EPOCH}" function add_ldflag() {
local -a ldflags=($(kube::version::ldflag "buildDate" "$(date ${buildDate} -u +'%Y-%m-%dT%H:%M:%SZ')")) local key=${1}
local val=${2}
# If you update these, also update the list pkg/version/def.bzl.
ldflags+=(
"-X '${KUBE_GO_PACKAGE}/pkg/version.${key}=${val}'"
"-X '${KUBE_GO_PACKAGE}/vendor/k8s.io/client-go/pkg/version.${key}=${val}'"
"-X '${KUBE_GO_PACKAGE}/pkg/kubectl/version.${key}=${val}'"
)
}
add_ldflag "buildDate" "$(date ${SOURCE_DATE_EPOCH:+"--date=@${SOURCE_DATE_EPOCH}"} -u +'%Y-%m-%dT%H:%M:%SZ')"
if [[ -n ${KUBE_GIT_COMMIT-} ]]; then if [[ -n ${KUBE_GIT_COMMIT-} ]]; then
ldflags+=($(kube::version::ldflag "gitCommit" "${KUBE_GIT_COMMIT}")) add_ldflag "gitCommit" "${KUBE_GIT_COMMIT}"
ldflags+=($(kube::version::ldflag "gitTreeState" "${KUBE_GIT_TREE_STATE}")) add_ldflag "gitTreeState" "${KUBE_GIT_TREE_STATE}"
fi fi
if [[ -n ${KUBE_GIT_VERSION-} ]]; then if [[ -n ${KUBE_GIT_VERSION-} ]]; then
ldflags+=($(kube::version::ldflag "gitVersion" "${KUBE_GIT_VERSION}")) add_ldflag "gitVersion" "${KUBE_GIT_VERSION}"
fi fi
if [[ -n ${KUBE_GIT_MAJOR-} && -n ${KUBE_GIT_MINOR-} ]]; then if [[ -n ${KUBE_GIT_MAJOR-} && -n ${KUBE_GIT_MINOR-} ]]; then
ldflags+=( add_ldflag "gitMajor" "${KUBE_GIT_MAJOR}"
$(kube::version::ldflag "gitMajor" "${KUBE_GIT_MAJOR}") add_ldflag "gitMinor" "${KUBE_GIT_MINOR}"
$(kube::version::ldflag "gitMinor" "${KUBE_GIT_MINOR}")
)
fi fi
# The -ldflags parameter takes a single string, so join the output. # The -ldflags parameter takes a single string, so join the output.