Skip to content

Commit c30ce5d

Browse files
bitfehleroktalz
authored andcommitted
BUG/MINOR: quit after printing version when invoked with -v
1 parent 82de96b commit c30ce5d

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

main.go

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,10 @@ func main() {
7171
return
7272
}
7373
logger.ShowFilename(false)
74-
logInfo(logger, osArgs)
74+
exit := logInfo(logger, osArgs)
75+
if exit {
76+
return
77+
}
7578
logger.ShowFilename(true)
7679

7780
// backwards compatibility with 1.7
@@ -129,7 +132,7 @@ func main() {
129132
close(stop)
130133
}
131134

132-
func logInfo(logger utils.Logger, osArgs utils.OSArgs) {
135+
func logInfo(logger utils.Logger, osArgs utils.OSArgs) bool {
133136
if len(osArgs.Version) > 0 {
134137
fmt.Printf("HAProxy Ingress Controller %s %s%s", GitTag, GitCommit, GitDirty)
135138
fmt.Printf("Build from: %s", GitRepo)
@@ -139,7 +142,7 @@ func logInfo(logger utils.Logger, osArgs utils.OSArgs) {
139142
fmt.Printf("Ingress class: %s", osArgs.IngressClass)
140143
fmt.Printf("Empty Ingress class: %t", osArgs.EmptyIngressClass)
141144
}
142-
return
145+
return true
143146
}
144147

145148
logger.Print(IngressControllerInfo)
@@ -189,6 +192,7 @@ func logInfo(logger utils.Logger, osArgs utils.OSArgs) {
189192
hostname, err := os.Hostname()
190193
logger.Error(err)
191194
logger.Printf("Running on %s", hostname)
195+
return false
192196
}
193197

194198
func getNamespaceValue(name string) *utils.NamespaceValue {

0 commit comments

Comments
 (0)