-
Notifications
You must be signed in to change notification settings - Fork 62
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
ensure kind command outputs are available (#435)
- Loading branch information
Showing
4 changed files
with
84 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| package kind | ||
|
|
||
| import ( | ||
| "fmt" | ||
|
|
||
| "github.com/go-logr/logr" | ||
| kindlog "sigs.k8s.io/kind/pkg/log" | ||
| ) | ||
|
|
||
| // this is a wrapper of logr.Logger made specifically for kind' logger. | ||
| // this is needed because kind's implementation is internal. | ||
| // https://github.com/kubernetes-sigs/kind/blob/1a8f0473a0785e0975e26739524513e8ee696be3/pkg/log/types.go | ||
| type kindLogger struct { | ||
| cliLogger *logr.Logger | ||
| } | ||
|
|
||
| func (l *kindLogger) Warn(message string) { | ||
| l.cliLogger.Info(message) | ||
| } | ||
|
|
||
| func (l *kindLogger) Warnf(message string, args ...interface{}) { | ||
| l.cliLogger.Info(fmt.Sprintf(message, args...)) | ||
| } | ||
|
|
||
| func (l *kindLogger) Error(message string) { | ||
| l.cliLogger.Error(fmt.Errorf(message), "") | ||
| } | ||
|
|
||
| func (l *kindLogger) Errorf(message string, args ...interface{}) { | ||
| msg := fmt.Sprintf(message, args...) | ||
| l.cliLogger.Error(fmt.Errorf(msg), "") | ||
| } | ||
|
|
||
| func (l *kindLogger) V(level kindlog.Level) kindlog.InfoLogger { | ||
| return newKindInfoLogger(l.cliLogger, int(level)) | ||
| } | ||
|
|
||
| // this is a wrapper of logr.Logger made specifically for kind's InfoLogger. | ||
| // https://github.com/kubernetes-sigs/kind/blob/1a8f0473a0785e0975e26739524513e8ee696be3/pkg/log/types.go | ||
| func kindLoggerFromLogr(logrLogger *logr.Logger) *kindLogger { | ||
| return &kindLogger{ | ||
| cliLogger: logrLogger, | ||
| } | ||
| } | ||
|
|
||
| func newKindInfoLogger(logrLogger *logr.Logger, level int) *kindInfoLogger { | ||
| return &kindInfoLogger{ | ||
| cliLogger: logrLogger, | ||
| level: level + 1, // push log level down. e.g. info log becomes debug+1. | ||
| } | ||
| } | ||
|
|
||
| type kindInfoLogger struct { | ||
| cliLogger *logr.Logger | ||
| level int | ||
| } | ||
|
|
||
| func (k *kindInfoLogger) Info(message string) { | ||
| k.cliLogger.V(k.level).Info(message) | ||
| } | ||
|
|
||
| func (k *kindInfoLogger) Infof(message string, args ...interface{}) { | ||
| k.cliLogger.V(k.level).Info(fmt.Sprintf(message, args...)) | ||
| } | ||
|
|
||
| func (k *kindInfoLogger) Enabled() bool { | ||
| return k.cliLogger.Enabled() | ||
| } |