@@ -63,10 +63,11 @@ func main() {
6363 logf .SetLogger (zap .New (zap .UseFlagOptions (& opts .Zap )))
6464
6565 log := logf .Log .WithName ("DeploymentValidation" )
66+ logVersion (log )
6667
6768 log .Info ("Setting Up Manager" )
6869
69- mgr , err := setupManager (log , opts )
70+ mgr , err := setupManager (log . V ( 1 ) , opts )
7071 if err != nil {
7172 fail (log , err , "Unexpected error occurred while setting up manager" )
7273 }
@@ -78,34 +79,33 @@ func main() {
7879 }
7980}
8081
81- func setupManager (log logr.Logger , opts options.Options ) (manager.Manager , error ) {
82- logVersion (log )
82+ func setupManager (logger logr.Logger , opts options.Options ) (manager.Manager , error ) {
8383
84- log .Info ("Load KubeConfig" )
84+ logger .Info ("Load KubeConfig" )
8585
8686 cfg , err := config .GetConfig ()
8787 if err != nil {
8888 return nil , fmt .Errorf ("getting config: %w" , err )
8989 }
9090
91- log .Info ("Initialize Manager" )
91+ logger .Info ("Initialize Manager" )
9292
93- mgr , err := initManager (log , opts , cfg )
93+ mgr , err := initManager (logger , opts , cfg )
9494 if err != nil {
9595 return nil , fmt .Errorf ("initializing manager: %w" , err )
9696 }
9797
98- log .Info ("Registering Components" )
98+ logger .Info ("Registering Components" )
9999
100- log .Info ("Initialize Prometheus Registry" )
100+ logger .Info ("Initialize Prometheus Registry" )
101101
102102 reg := prometheus .NewRegistry ()
103103 metrics , err := dvoProm .PreloadMetrics (reg )
104104 if err != nil {
105105 return nil , fmt .Errorf ("preloading kube-linter metrics: %w" , err )
106106 }
107107
108- log .Info (fmt . Sprintf ( "Initialize Prometheus metrics endpoint on %q" , opts .MetricsEndpoint () ))
108+ logger .Info ("Initialize Prometheus metrics endpoint" , "endpoint" , opts .MetricsEndpoint ())
109109
110110 srv , err := dvoProm .NewServer (reg , opts .MetricsPath , fmt .Sprintf (":%d" , opts .MetricsPort ))
111111 if err != nil {
@@ -116,7 +116,7 @@ func setupManager(log logr.Logger, opts options.Options) (manager.Manager, error
116116 return nil , fmt .Errorf ("adding metrics server to manager: %w" , err )
117117 }
118118
119- log .Info ("Initialize ConfigMap watcher" )
119+ logger .Info ("Initialize ConfigMap watcher" )
120120
121121 cmWatcher , err := configmap .NewWatcher (cfg )
122122 if err != nil {
@@ -127,14 +127,14 @@ func setupManager(log logr.Logger, opts options.Options) (manager.Manager, error
127127 return nil , fmt .Errorf ("adding configmap watcher to manager: %w" , err )
128128 }
129129
130- log .Info ("Initialize Validation Engine" )
130+ logger .Info ("Initialize Validation Engine" )
131131
132132 validationEngine , err := validations .NewValidationEngine (opts .ConfigFile , metrics )
133133 if err != nil {
134134 return nil , fmt .Errorf ("initializing validation engine: %w" , err )
135135 }
136136
137- log .Info ("Initialize Reconciler" )
137+ logger .Info ("Initialize Reconciler" )
138138
139139 discoveryClient , err := discovery .NewDiscoveryClientForConfig (mgr .GetConfig ())
140140 if err != nil {
@@ -153,16 +153,16 @@ func setupManager(log logr.Logger, opts options.Options) (manager.Manager, error
153153 return mgr , nil
154154}
155155
156- func fail (log logr.Logger , err error , msg string ) {
157- log .Error (err , msg )
156+ func fail (logger logr.Logger , err error , msg string ) {
157+ logger .Error (err , msg )
158158
159159 os .Exit (1 )
160160}
161161
162- func logVersion (log logr.Logger ) {
163- log .Info (fmt .Sprintf ("Operator Version: %s" , version .Version ))
164- log .Info (fmt .Sprintf ("Go Version: %s" , runtime .Version ()))
165- log .Info (fmt .Sprintf ("Go OS/Arch: %s/%s" , runtime .GOOS , runtime .GOARCH ))
162+ func logVersion (logger logr.Logger ) {
163+ logger .Info (fmt .Sprintf ("Operator Version: %s" , version .Version ))
164+ logger .Info (fmt .Sprintf ("Go Version: %s" , runtime .Version ()))
165+ logger .Info (fmt .Sprintf ("Go OS/Arch: %s/%s" , runtime .GOOS , runtime .GOARCH ))
166166}
167167
168168func initializeScheme () (* k8sruntime.Scheme , error ) {
@@ -185,7 +185,7 @@ func initializeScheme() (*k8sruntime.Scheme, error) {
185185
186186var errWatchNamespaceNotSet = errors .New ("'WatchNamespace' not set" )
187187
188- func getManagerOptions (scheme * k8sruntime.Scheme , opts options.Options ) (manager.Options , error ) {
188+ func getManagerOptions (scheme * k8sruntime.Scheme , opts options.Options , logger logr. Logger ) (manager.Options , error ) {
189189 ns , ok := opts .GetWatchNamespace ()
190190 if ! ok {
191191 return manager.Options {}, errWatchNamespaceNotSet
@@ -196,6 +196,7 @@ func getManagerOptions(scheme *k8sruntime.Scheme, opts options.Options) (manager
196196 // disable caching of everything
197197 NewClient : newClient ,
198198 Scheme : scheme ,
199+ Logger : logger ,
199200 }
200201
201202 // disable controller-runtime managed prometheus endpoint
@@ -241,15 +242,15 @@ func kubeClientQPS() (float32, error) {
241242 return qps , err
242243}
243244
244- func initManager (log logr.Logger , opts options.Options , cfg * rest.Config ) (manager.Manager , error ) {
245- log .Info ("Initialize Scheme" )
245+ func initManager (logger logr.Logger , opts options.Options , cfg * rest.Config ) (manager.Manager , error ) {
246+ logger .Info ("Initialize Scheme" )
246247 scheme , err := initializeScheme ()
247248 if err != nil {
248249 return nil , fmt .Errorf ("initializing scheme: %w" , err )
249250 }
250251
251- log .Info ("Getting Manager Options" )
252- mgrOpts , err := getManagerOptions (scheme , opts )
252+ logger .Info ("Getting Manager Options" )
253+ mgrOpts , err := getManagerOptions (scheme , opts , logger )
253254 if err != nil {
254255 return nil , fmt .Errorf ("getting manager options: %w" , err )
255256 }
@@ -259,7 +260,7 @@ func initManager(log logr.Logger, opts options.Options, cfg *rest.Config) (manag
259260 return nil , fmt .Errorf ("getting new manager: %w" , err )
260261 }
261262
262- log .Info ("Adding Healthz and Readyz checks" )
263+ logger .Info ("Adding Healthz and Readyz checks" )
263264 if err := mgr .AddHealthzCheck ("health" , healthz .Ping ); err != nil {
264265 return nil , fmt .Errorf ("adding healthz check: %w" , err )
265266 }
0 commit comments