Skip to content

Commit 9e635f2

Browse files
authored
Merge pull request #38 from iovisor/fix/default-image-version
fix(pkg/version): default image version as go constant
2 parents a5b3d5d + 06dfa11 commit 9e635f2

File tree

1 file changed

+10
-4
lines changed

1 file changed

+10
-4
lines changed

pkg/version/version.go

+10-4
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ var imageName string
1212
var buildTime string
1313
var versionFormat = "git commit: %s\nbuild date: %s"
1414
var imageNameTagFormat = "%s:%s"
15+
var defaultImageName = "quay.io/fntlnz/kubectl-trace-bpftrace"
16+
var defaultImageTag = "latest"
1517

1618
// ImageName returns the container image name defined in Makefile
1719
func ImageName() string {
@@ -23,11 +25,15 @@ func GitCommit() string {
2325
}
2426

2527
func ImageNameTag() string {
26-
commit := GitCommit()
27-
if len(commit) == 0 {
28-
return fmt.Sprintf(imageNameTagFormat, ImageName(), "latest")
28+
imageName := ImageName()
29+
tag := GitCommit()
30+
if len(tag) == 0 {
31+
tag = defaultImageTag
2932
}
30-
return fmt.Sprintf(imageNameTagFormat, ImageName(), GitCommit())
33+
if len(imageName) == 0 {
34+
imageName = defaultImageName
35+
}
36+
return fmt.Sprintf(imageNameTagFormat, imageName, tag)
3137
}
3238

3339
func Time() *time.Time {

0 commit comments

Comments
 (0)