Commit ca6fdc6e authored by Adam Reese's avatar Adam Reese

fix(version): use build version in helm

parent 187f6e05
...@@ -48,7 +48,7 @@ func main() { ...@@ -48,7 +48,7 @@ func main() {
} }
wrapper.Register(container) wrapper.Register(container)
log.Printf("Version: %s", version.DeploymentManagerVersion) log.Printf("Version: %s", version.Version)
log.Printf("Listening on %s...", address) log.Printf("Listening on %s...", address)
log.Fatal(server.ListenAndServe()) log.Fatal(server.ListenAndServe())
} }
...@@ -21,10 +21,9 @@ import ( ...@@ -21,10 +21,9 @@ import (
"github.com/codegangsta/cli" "github.com/codegangsta/cli"
"github.com/kubernetes/deployment-manager/pkg/client" "github.com/kubernetes/deployment-manager/pkg/client"
"github.com/kubernetes/deployment-manager/pkg/version"
) )
var version = "0.0.1"
var commands []cli.Command var commands []cli.Command
func init() { func init() {
...@@ -34,7 +33,7 @@ func init() { ...@@ -34,7 +33,7 @@ func init() {
func main() { func main() {
app := cli.NewApp() app := cli.NewApp()
app.Name = "helm" app.Name = "helm"
app.Version = version app.Version = version.Version
app.Usage = `Deploy and manage packages.` app.Usage = `Deploy and manage packages.`
app.Commands = commands app.Commands = commands
......
...@@ -79,7 +79,7 @@ func main() { ...@@ -79,7 +79,7 @@ func main() {
address := fmt.Sprintf(":%d", *port) address := fmt.Sprintf(":%d", *port)
handler := handlers.CombinedLoggingHandler(os.Stderr, router) handler := handlers.CombinedLoggingHandler(os.Stderr, router)
log.Printf("Version: %s", version.DeploymentManagerVersion) log.Printf("Version: %s", version.Version)
log.Printf("Listening on port %d...", *port) log.Printf("Listening on port %d...", *port)
log.Fatal(http.ListenAndServe(address, handler)) log.Fatal(http.ListenAndServe(address, handler))
} }
......
...@@ -73,7 +73,7 @@ func main() { ...@@ -73,7 +73,7 @@ func main() {
address := fmt.Sprintf(":%d", *port) address := fmt.Sprintf(":%d", *port)
handler := handlers.CombinedLoggingHandler(os.Stderr, router) handler := handlers.CombinedLoggingHandler(os.Stderr, router)
log.Printf("Version: %s", version.DeploymentManagerVersion) log.Printf("Version: %s", version.Version)
log.Printf("Listening on port %d...", *port) log.Printf("Listening on port %d...", *port)
log.Fatal(http.ListenAndServe(address, handler)) log.Fatal(http.ListenAndServe(address, handler))
} }
......
...@@ -16,10 +16,10 @@ limitations under the License. ...@@ -16,10 +16,10 @@ limitations under the License.
package version package version
// DeploymentManagerVersion is the current version of the Deployment Manager. // Version is the current version of the Deployment Manager.
// Update this whenever making a new release. // Update this whenever making a new release.
// The version is of the format Major.Minor.Patch // The version is of the format Major.Minor.Patch
// Increment major number for new feature additions and behavioral changes. // Increment major number for new feature additions and behavioral changes.
// Increment minor number for bug fixes and performance enhancements. // Increment minor number for bug fixes and performance enhancements.
// Increment patch number for critical fixes to existing releases. // Increment patch number for critical fixes to existing releases.
var DeploymentManagerVersion = "0.0.1" var Version = "0.0.1"
...@@ -32,7 +32,7 @@ assign_version() { ...@@ -32,7 +32,7 @@ assign_version() {
assign_ldflags() { assign_ldflags() {
if [[ -z "${LDFLAGS:-}" ]]; then if [[ -z "${LDFLAGS:-}" ]]; then
LDFLAGS="-s -X ${REPO}/pkg/version.DeploymentManagerVersion=${VERSION}" LDFLAGS="-s -X ${REPO}/pkg/version.Version=${VERSION}"
fi fi
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment