Skip to content

Commit 1a56adc

Browse files
authored
pkg/scaffold: fixing main printVersion (#752)
1 parent 8412ccb commit 1a56adc

File tree

2 files changed

+14
-10
lines changed

2 files changed

+14
-10
lines changed

pkg/scaffold/cmd.go

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,22 +54,24 @@ import (
5454
"sigs.k8s.io/controller-runtime/pkg/runtime/signals"
5555
)
5656
57+
var log = logf.Log.WithName("cmd")
58+
5759
func printVersion() {
58-
logf.Log.Info(fmt.Sprintf("Go Version: %s", runtime.Version()))
59-
logf.Log.Info(fmt.Sprintf("Go OS/Arch: %s/%s", runtime.GOOS, runtime.GOARCH))
60-
logf.Log.Info(fmt.Sprintf("operator-sdk Version: %v", sdkVersion.Version))
60+
log.Info(fmt.Sprintf("Go Version: %s", runtime.Version()))
61+
log.Info(fmt.Sprintf("Go OS/Arch: %s/%s", runtime.GOOS, runtime.GOARCH))
62+
log.Info(fmt.Sprintf("operator-sdk Version: %v", sdkVersion.Version))
6163
}
6264
6365
func main() {
64-
printVersion()
6566
flag.Parse()
6667
6768
// The logger instantiated here can be changed to any logger
6869
// implementing the logr.Logger interface. This logger will
6970
// be propagated through the whole operator, generating
7071
// uniform and structured logs.
7172
logf.SetLogger(logf.ZapLogger(false))
72-
log := logf.Log.WithName("cmd")
73+
74+
printVersion()
7375
7476
namespace, err := k8sutil.GetWatchNamespace()
7577
if err != nil {

pkg/scaffold/cmd_test.go

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,22 +52,24 @@ import (
5252
"sigs.k8s.io/controller-runtime/pkg/runtime/signals"
5353
)
5454
55+
var log = logf.Log.WithName("cmd")
56+
5557
func printVersion() {
56-
logf.Log.Info(fmt.Sprintf("Go Version: %s", runtime.Version()))
57-
logf.Log.Info(fmt.Sprintf("Go OS/Arch: %s/%s", runtime.GOOS, runtime.GOARCH))
58-
logf.Log.Info(fmt.Sprintf("operator-sdk Version: %v", sdkVersion.Version))
58+
log.Info(fmt.Sprintf("Go Version: %s", runtime.Version()))
59+
log.Info(fmt.Sprintf("Go OS/Arch: %s/%s", runtime.GOOS, runtime.GOARCH))
60+
log.Info(fmt.Sprintf("operator-sdk Version: %v", sdkVersion.Version))
5961
}
6062
6163
func main() {
62-
printVersion()
6364
flag.Parse()
6465
6566
// The logger instantiated here can be changed to any logger
6667
// implementing the logr.Logger interface. This logger will
6768
// be propagated through the whole operator, generating
6869
// uniform and structured logs.
6970
logf.SetLogger(logf.ZapLogger(false))
70-
log := logf.Log.WithName("cmd")
71+
72+
printVersion()
7173
7274
namespace, err := k8sutil.GetWatchNamespace()
7375
if err != nil {

0 commit comments

Comments
 (0)