Skip to content

Commit a3521cf

Browse files
committed
BUG/MINOR: go: clean version info from dirty message
1 parent db6f407 commit a3521cf

File tree

4 files changed

+3
-12
lines changed

4 files changed

+3
-12
lines changed

.goreleaser.yml

-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ builds:
2323
- -X "main.GitRepo={{.GitURL}}"
2424
- -X "main.GitTag={{.Tag}}"
2525
- -X "main.GitCommit={{.ShortCommit}}"
26-
- -X "main.GitDirty= "
2726
- -X "main.BuildTime={{.Date}}"
2827
goos:
2928
- linux

main.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ func main() {
8383
if osArgs.JobCheckCRD {
8484
logger.Print(version.IngressControllerInfo)
8585
logger.Print(job.IngressControllerCRDUpdater)
86-
logger.Infof("HAProxy Ingress Controller CRD Updater %s %s%s", version.GitTag, version.GitCommit, version.GitDirty)
86+
logger.Infof("HAProxy Ingress Controller CRD Updater %s %s", version.GitTag, version.GitCommit)
8787
logger.Infof("Build from: %s", version.GitRepo)
8888
logger.Infof("Build date: %s\n", version.GitCommitDate)
8989

@@ -164,7 +164,7 @@ func main() {
164164

165165
func logInfo(logger utils.Logger, osArgs utils.OSArgs) bool {
166166
if len(osArgs.Version) > 0 {
167-
fmt.Printf("HAProxy Ingress Controller %s %s%s\n", version.GitTag, version.GitCommit, version.GitDirty)
167+
fmt.Printf("HAProxy Ingress Controller %s %s\n", version.GitTag, version.GitCommit)
168168
fmt.Printf("Build from: %s\n", version.GitRepo)
169169
fmt.Printf("Git commit date: %s\n", version.GitCommitDate)
170170
if len(osArgs.Version) > 1 {
@@ -176,7 +176,7 @@ func logInfo(logger utils.Logger, osArgs utils.OSArgs) bool {
176176
}
177177

178178
logger.Print(version.IngressControllerInfo)
179-
logger.Printf("HAProxy Ingress Controller %s %s%s", version.GitTag, version.GitCommit, version.GitDirty)
179+
logger.Printf("HAProxy Ingress Controller %s %s", version.GitTag, version.GitCommit)
180180
logger.Printf("Build from: %s", version.GitRepo)
181181
logger.Printf("Git commit date: %s", version.GitCommitDate)
182182
logger.Printf("ConfigMap: %s", osArgs.ConfigMap)

pkg/version/runtime.go

-5
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,6 @@ func Set() error {
3030
if len(GitCommit) > 8 {
3131
GitCommit = GitCommit[:8]
3232
}
33-
if get(buildinfo, "vcs.modified") == "true" {
34-
GitDirty = ".dirty"
35-
} else {
36-
GitDirty = ""
37-
}
3833

3934
return nil
4035
}

pkg/version/version.go

-3
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@ var GitTag = "dev"
2323
// GitCommit ...
2424
var GitCommit = ""
2525

26-
// GitDirty ...
27-
var GitDirty = "dirty"
28-
2926
// GitCommitDate ...
3027
var GitCommitDate = ""
3128

0 commit comments

Comments
 (0)