Skip to content

Commit 64e68c4

Browse files
Merge pull request #15610 from openshift-cherrypick-robot/cherry-pick-15069-to-release-4.19
[release-4.19] OCPBUGS-63156: Initialize log package
2 parents 9c496c6 + d975366 commit 64e68c4

File tree

15 files changed

+1556
-0
lines changed

15 files changed

+1556
-0
lines changed

cmd/bridge/main.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ import (
2626
oscrypto "github.com/openshift/library-go/pkg/crypto"
2727
"k8s.io/client-go/rest"
2828
klog "k8s.io/klog/v2"
29+
"sigs.k8s.io/controller-runtime/pkg/log"
30+
"sigs.k8s.io/controller-runtime/pkg/log/zap"
2931
)
3032

3133
const (
@@ -63,6 +65,9 @@ const (
6365
)
6466

6567
func main() {
68+
// Initialize controller-runtime logger, needed for the OLM handler
69+
log.SetLogger(zap.New())
70+
6671
fs := flag.NewFlagSet("bridge", flag.ExitOnError)
6772
klog.InitFlags(fs)
6873
defer klog.Flush()

go.mod

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ require (
9393
github.com/go-gorp/gorp/v3 v3.1.0 // indirect
9494
github.com/go-logr/logr v1.4.2 // indirect
9595
github.com/go-logr/stdr v1.2.2 // indirect
96+
github.com/go-logr/zapr v1.3.0 // indirect
9697
github.com/go-openapi/jsonpointer v0.21.0 // indirect
9798
github.com/go-openapi/jsonreference v0.21.0 // indirect
9899
github.com/go-openapi/swag v0.23.0 // indirect

vendor/github.com/go-logr/logr/slogr/slogr.go

Lines changed: 61 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/go-logr/zapr/.gitignore

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/go-logr/zapr/.golangci.yaml

Lines changed: 20 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/go-logr/zapr/LICENSE

Lines changed: 201 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)