@@ -21,17 +21,26 @@ import (
21
21
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
22
22
"sigs.k8s.io/controller-runtime/pkg/webhook"
23
23
24
+ "github.com/openmfp/golang-commons/logger"
24
25
"github.com/openmfp/kubernetes-graphql-gateway/listener/discoveryclient"
25
26
"github.com/openmfp/kubernetes-graphql-gateway/listener/kcp"
26
27
)
27
28
28
29
var (
29
30
scheme = runtime .NewScheme ()
30
- setupLog = ctrl . Log . WithName ( "setup" )
31
+ setupLog * logger. Logger
31
32
webhookServer webhook.Server
32
33
metricsServerOptions metricsserver.Options
33
34
)
34
35
36
+ func init () {
37
+ var err error
38
+ setupLog , err = setupLogger ("info" )
39
+ if err != nil {
40
+ panic ("failed to initialize setup logger: " + err .Error ())
41
+ }
42
+ }
43
+
35
44
var listenCmd = & cobra.Command {
36
45
Use : "listener" ,
37
46
Example : "KUBECONFIG=<path to kubeconfig file> go run . listener" ,
@@ -48,7 +57,7 @@ var listenCmd = &cobra.Command{
48
57
ctrl .SetLogger (zap .New (zap .UseFlagOptions (& opts )))
49
58
50
59
disableHTTP2 := func (c * tls.Config ) {
51
- setupLog .Info ("disabling http/2" )
60
+ setupLog .Info (). Msg ( "disabling http/2" )
52
61
c .NextProtos = []string {"http/1.1" }
53
62
}
54
63
@@ -76,7 +85,7 @@ var listenCmd = &cobra.Command{
76
85
restCfg := ctrl .GetConfigOrDie ()
77
86
log , err := setupLogger (defaultCfg .Log .Level )
78
87
if err != nil {
79
- setupLog .Error (err , "unable to setup logger" )
88
+ setupLog .Error (). Err ( err ). Msg ( "unable to setup logger" )
80
89
os .Exit (1 )
81
90
}
82
91
@@ -93,21 +102,21 @@ var listenCmd = &cobra.Command{
93
102
Scheme : scheme ,
94
103
})
95
104
if err != nil {
96
- setupLog .Error (err , "failed to create client from config" )
105
+ setupLog .Error (). Err ( err ). Msg ( "failed to create client from config" )
97
106
os .Exit (1 )
98
107
}
99
108
100
109
mf := kcp .NewManagerFactory (log , appCfg )
101
110
102
111
mgr , err := mf .NewManager (ctx , restCfg , mgrOpts , clt )
103
112
if err != nil {
104
- setupLog .Error (err , "unable to start manager" )
113
+ setupLog .Error (). Err ( err ). Msg ( "unable to start manager" )
105
114
os .Exit (1 )
106
115
}
107
116
108
117
discoveryInterface , err := discovery .NewDiscoveryClientForConfig (restCfg )
109
118
if err != nil {
110
- setupLog .Error (err , "failed to create discovery client" )
119
+ setupLog .Error (). Err ( err ). Msg ( "failed to create discovery client" )
111
120
os .Exit (1 )
112
121
}
113
122
@@ -118,30 +127,30 @@ var listenCmd = &cobra.Command{
118
127
OpenAPIDefinitionsPath : appCfg .OpenApiDefinitionsPath ,
119
128
}
120
129
121
- reconciler , err := kcp .NewReconciler (appCfg , reconcilerOpts , restCfg , discoveryInterface , kcp .PreReconcile , discoveryclient .NewFactory )
130
+ reconciler , err := kcp .NewReconciler (appCfg , reconcilerOpts , restCfg , discoveryInterface , kcp .PreReconcile , discoveryclient .NewFactory , log )
122
131
123
132
if err != nil {
124
- setupLog .Error (err , "unable to instantiate reconciler" )
133
+ setupLog .Error (). Err ( err ). Msg ( "unable to instantiate reconciler" )
125
134
os .Exit (1 )
126
135
}
127
136
128
137
if err := reconciler .SetupWithManager (mgr ); err != nil {
129
- setupLog .Error (err , "unable to create controller" )
138
+ setupLog .Error (). Err ( err ). Msg ( "unable to create controller" )
130
139
os .Exit (1 )
131
140
}
132
141
133
142
if err := mgr .AddHealthzCheck ("healthz" , healthz .Ping ); err != nil {
134
- setupLog .Error (err , "unable to set up health check" )
143
+ setupLog .Error (). Err ( err ). Msg ( "unable to set up health check" )
135
144
os .Exit (1 )
136
145
}
137
146
if err := mgr .AddReadyzCheck ("readyz" , healthz .Ping ); err != nil {
138
- setupLog .Error (err , "unable to set up ready check" )
147
+ setupLog .Error (). Err ( err ). Msg ( "unable to set up ready check" )
139
148
os .Exit (1 )
140
149
}
141
150
142
- setupLog .Info ("starting manager" )
151
+ setupLog .Info (). Msg ( "starting manager" )
143
152
if err := mgr .Start (ctx ); err != nil {
144
- setupLog .Error (err , "problem running manager" )
153
+ setupLog .Error (). Err ( err ). Msg ( "problem running manager" )
145
154
os .Exit (1 )
146
155
}
147
156
},
0 commit comments