From 68bef4ac0c95b7d8cc92dd39c9c1d7bf5761b591 Mon Sep 17 00:00:00 2001 From: Daniel Smith Date: Wed, 2 Jul 2014 14:28:01 -0700 Subject: [PATCH 1/2] add version package --- pkg/version/autogenerated.go | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 pkg/version/autogenerated.go diff --git a/pkg/version/autogenerated.go b/pkg/version/autogenerated.go new file mode 100644 index 00000000000..e69de29bb2d From 60f05c8d8d0467bd59a3155235d78905862a76fd Mon Sep 17 00:00:00 2001 From: Daniel Smith Date: Wed, 2 Jul 2014 14:57:26 -0700 Subject: [PATCH 2/2] update version package when building. --- .gitignore | 3 +++ hack/build-go.sh | 3 +++ hack/version-gen.sh | 23 +++++++++++++++++++++++ pkg/version/autogenerated.go | 0 pkg/version/doc.go | 19 +++++++++++++++++++ pkg/version/template.go | 23 +++++++++++++++++++++++ pkg/version/version.go | 21 +++++++++++++++++++++ 7 files changed, 92 insertions(+) create mode 100755 hack/version-gen.sh delete mode 100644 pkg/version/autogenerated.go create mode 100644 pkg/version/doc.go create mode 100644 pkg/version/template.go create mode 100644 pkg/version/version.go diff --git a/.gitignore b/.gitignore index af24779b2cf..4a2583979a1 100755 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,6 @@ # Mercurial files **/.hg **/.hg* + +# Version file we automatically make +/pkg/version/autogenerated.go diff --git a/hack/build-go.sh b/hack/build-go.sh index e2869a3bacd..4b41ec128a9 100755 --- a/hack/build-go.sh +++ b/hack/build-go.sh @@ -18,6 +18,9 @@ set -e +# Update the version. +$(dirname $0)/version-gen.sh + source $(dirname $0)/config-go.sh cd "${KUBE_TARGET}" diff --git a/hack/version-gen.sh b/hack/version-gen.sh new file mode 100755 index 00000000000..5b14f869cb6 --- /dev/null +++ b/hack/version-gen.sh @@ -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}" diff --git a/pkg/version/autogenerated.go b/pkg/version/autogenerated.go deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/pkg/version/doc.go b/pkg/version/doc.go new file mode 100644 index 00000000000..0993bcf86cb --- /dev/null +++ b/pkg/version/doc.go @@ -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 diff --git a/pkg/version/template.go b/pkg/version/template.go new file mode 100644 index 00000000000..f7d0e5c17f5 --- /dev/null +++ b/pkg/version/template.go @@ -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{} +) diff --git a/pkg/version/version.go b/pkg/version/version.go new file mode 100644 index 00000000000..ea5e4db15eb --- /dev/null +++ b/pkg/version/version.go @@ -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 +}