Merge pull request #344 from lavalamp/version

A package to get version information from
This commit is contained in:
brendandburns 2014-07-02 16:41:18 -07:00
commit 1fc71893cf
6 changed files with 92 additions and 0 deletions

3
.gitignore vendored
View File

@ -19,3 +19,6 @@
# Mercurial files # Mercurial files
**/.hg **/.hg
**/.hg* **/.hg*
# Version file we automatically make
/pkg/version/autogenerated.go

View File

@ -18,6 +18,9 @@
set -e set -e
# Update the version.
$(dirname $0)/version-gen.sh
source $(dirname $0)/config-go.sh source $(dirname $0)/config-go.sh
cd "${KUBE_TARGET}" cd "${KUBE_TARGET}"

23
hack/version-gen.sh Executable file
View File

@ -0,0 +1,23 @@
#!/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.
# TODO: when we start making tags, switch to git describe?
desc=$(git rev-list --abbrev-commit --max-count=1 HEAD)
tab=$'\t'
script="22s/.*/${tab}commitFromGit = \`${desc}\`/"
infile="$(dirname $0)/../pkg/version/template.go"
outfile="$(dirname $0)/../pkg/version/autogenerated.go"
sed "${script}" "${infile}" > "${outfile}"

19
pkg/version/doc.go Normal file
View File

@ -0,0 +1,19 @@
/*
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.
*/
// Package version supplies version information collected at build time to
// kubernetes components.
package version

23
pkg/version/template.go Normal file
View File

@ -0,0 +1,23 @@
/*
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.
*/
package version
// This file is the template for the machine-edited autogenerated.go.
// Do not modify this file without also modifying hack/version-gen.sh.
var (
placeholder interface{}
)

21
pkg/version/version.go Normal file
View File

@ -0,0 +1,21 @@
/*
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.
*/
package version
func Get() (major, minor, gitCommit string) {
return "v1beta", "1", commitFromGit
}