Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
H
helm3
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
go
helm3
Commits
ca6fdc6e
Commit
ca6fdc6e
authored
Mar 14, 2016
by
Adam Reese
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(version): use build version in helm
parent
187f6e05
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
8 additions
and
9 deletions
+8
-9
main.go
cmd/expandybird/main.go
+1
-1
helm.go
cmd/helm/helm.go
+2
-3
main.go
cmd/manager/main.go
+1
-1
main.go
cmd/resourcifier/main.go
+1
-1
version.go
pkg/version/version.go
+2
-2
common.sh
scripts/common.sh
+1
-1
No files found.
cmd/expandybird/main.go
View file @
ca6fdc6e
...
@@ -48,7 +48,7 @@ func main() {
...
@@ -48,7 +48,7 @@ func main() {
}
}
wrapper
.
Register
(
container
)
wrapper
.
Register
(
container
)
log
.
Printf
(
"Version: %s"
,
version
.
DeploymentManager
Version
)
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
())
}
}
cmd/helm/helm.go
View file @
ca6fdc6e
...
@@ -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
...
...
cmd/manager/main.go
View file @
ca6fdc6e
...
@@ -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
.
DeploymentManager
Version
)
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
))
}
}
...
...
cmd/resourcifier/main.go
View file @
ca6fdc6e
...
@@ -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
.
DeploymentManager
Version
)
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
))
}
}
...
...
pkg/version/version.go
View file @
ca6fdc6e
...
@@ -16,10 +16,10 @@ limitations under the License.
...
@@ -16,10 +16,10 @@ limitations under the License.
package
version
package
version
//
DeploymentManager
Version 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
DeploymentManager
Version
=
"0.0.1"
var
Version
=
"0.0.1"
scripts/common.sh
View file @
ca6fdc6e
...
@@ -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.
DeploymentManager
Version=
${
VERSION
}
"
LDFLAGS
=
"-s -X
${
REPO
}
/pkg/version.Version=
${
VERSION
}
"
fi
fi
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment