Skip to content

Commit 521d348

Browse files
STRRLSTRRL
committed
chore: still using zap.New as the default logger bootstrapper
Signed-off-by: STRRL <im@strrl.dev>
1 parent 934ef05 commit 521d348

File tree

17 files changed

+38
-384
lines changed

17 files changed

+38
-384
lines changed

‎examples/builtins/main.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@ import (
2626
"sigs.k8s.io/controller-runtime/pkg/controller"
2727
"sigs.k8s.io/controller-runtime/pkg/handler"
2828
"sigs.k8s.io/controller-runtime/pkg/log"
29-
"sigs.k8s.io/controller-runtime/pkg/log/bootstrap"
29+
"sigs.k8s.io/controller-runtime/pkg/log/zap"
3030
"sigs.k8s.io/controller-runtime/pkg/manager"
3131
"sigs.k8s.io/controller-runtime/pkg/manager/signals"
3232
"sigs.k8s.io/controller-runtime/pkg/source"
3333
"sigs.k8s.io/controller-runtime/pkg/webhook"
3434
)
3535

3636
func init() {
37-
log.SetLogger(bootstrap.New())
37+
log.SetLogger(zap.New())
3838
}
3939

4040
func main() {

‎examples/configfile/builtin/main.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@ import (
2828
"sigs.k8s.io/controller-runtime/pkg/client/config"
2929
cfg "sigs.k8s.io/controller-runtime/pkg/config"
3030
"sigs.k8s.io/controller-runtime/pkg/log"
31-
"sigs.k8s.io/controller-runtime/pkg/log/bootstrap"
31+
"sigs.k8s.io/controller-runtime/pkg/log/zap"
3232
"sigs.k8s.io/controller-runtime/pkg/manager/signals"
3333
)
3434

3535
var scheme = runtime.NewScheme()
3636

3737
func init() {
38-
log.SetLogger(bootstrap.New())
38+
log.SetLogger(zap.New())
3939
clientgoscheme.AddToScheme(scheme)
4040
}
4141

‎examples/configfile/custom/main.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@ import (
2929
"sigs.k8s.io/controller-runtime/pkg/client/config"
3030
cfg "sigs.k8s.io/controller-runtime/pkg/config"
3131
"sigs.k8s.io/controller-runtime/pkg/log"
32-
"sigs.k8s.io/controller-runtime/pkg/log/bootstrap"
32+
"sigs.k8s.io/controller-runtime/pkg/log/zap"
3333
"sigs.k8s.io/controller-runtime/pkg/manager/signals"
3434
)
3535

3636
var scheme = runtime.NewScheme()
3737

3838
func init() {
39-
log.SetLogger(bootstrap.New())
39+
log.SetLogger(zap.New())
4040
clientgoscheme.AddToScheme(scheme)
4141
v1alpha1.AddToScheme(scheme)
4242
}

‎examples/crd/main.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import (
3030
api "sigs.k8s.io/controller-runtime/examples/crd/pkg"
3131
"sigs.k8s.io/controller-runtime/pkg/client"
3232
"sigs.k8s.io/controller-runtime/pkg/log"
33-
"sigs.k8s.io/controller-runtime/pkg/log/bootstrap"
33+
"sigs.k8s.io/controller-runtime/pkg/log/zap"
3434
)
3535

3636
var (
@@ -102,7 +102,7 @@ func (r *reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resu
102102
}
103103

104104
func main() {
105-
ctrl.SetLogger(bootstrap.New())
105+
ctrl.SetLogger(zap.New())
106106

107107
mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{})
108108
if err != nil {

‎examples/scratch-env/main.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import (
2525

2626
ctrl "sigs.k8s.io/controller-runtime"
2727
"sigs.k8s.io/controller-runtime/pkg/envtest"
28-
"sigs.k8s.io/controller-runtime/pkg/log/bootstrap"
2928
"sigs.k8s.io/controller-runtime/pkg/log/zap"
3029
)
3130

@@ -46,7 +45,7 @@ func runMain() int {
4645
flag.CommandLine.AddGoFlagSet(&goFlagSet)
4746
}
4847
flag.Parse()
49-
ctrl.SetLogger(bootstrap.New(zap.UseFlagOptions(loggerOpts)))
48+
ctrl.SetLogger(zap.New(zap.UseFlagOptions(loggerOpts)))
5049

5150
log := ctrl.Log.WithName("main")
5251

‎examples/tokenreview/main.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ import (
2222
_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
2323
"sigs.k8s.io/controller-runtime/pkg/client/config"
2424
"sigs.k8s.io/controller-runtime/pkg/log"
25-
"sigs.k8s.io/controller-runtime/pkg/log/bootstrap"
25+
"sigs.k8s.io/controller-runtime/pkg/log/zap"
2626
"sigs.k8s.io/controller-runtime/pkg/manager"
2727
"sigs.k8s.io/controller-runtime/pkg/manager/signals"
2828
"sigs.k8s.io/controller-runtime/pkg/webhook/authentication"
2929
)
3030

3131
func init() {
32-
log.SetLogger(bootstrap.New())
32+
log.SetLogger(zap.New())
3333
}
3434

3535
func main() {

‎go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ require (
1111
github.com/onsi/gomega v1.18.1
1212
github.com/prometheus/client_golang v1.12.1
1313
github.com/prometheus/client_model v0.2.0
14+
go.uber.org/atomic v1.7.0
1415
go.uber.org/goleak v1.1.12
1516
go.uber.org/zap v1.19.1
1617
golang.org/x/sys v0.0.0-20220209214540-3681064d5158
@@ -57,7 +58,6 @@ require (
5758
github.com/prometheus/common v0.32.1 // indirect
5859
github.com/prometheus/procfs v0.7.3 // indirect
5960
github.com/spf13/pflag v1.0.5 // indirect
60-
go.uber.org/atomic v1.7.0 // indirect
6161
go.uber.org/multierr v1.6.0 // indirect
6262
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
6363
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect

‎pkg/log/bootstrap/doc.go

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎pkg/log/bootstrap/log.go

Lines changed: 0 additions & 37 deletions
This file was deleted.

‎pkg/log/logr/doc.go

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎pkg/log/logr/logr_suite_test.go

Lines changed: 0 additions & 31 deletions
This file was deleted.

0 commit comments

Comments
 (0)