Skip to content

Commit 192ac97

Browse files
committed
⚠️ Remove deprecated runtime/log package
Signed-off-by: Vince Prignano <[email protected]>
1 parent 4ffd908 commit 192ac97

File tree

5 files changed

+2
-96
lines changed

5 files changed

+2
-96
lines changed

examples/builtins/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import (
3636
var log = logf.Log.WithName("example-controller")
3737

3838
func main() {
39-
logf.SetLogger(zap.Logger(false))
39+
logf.SetLogger(zap.New())
4040
entryLog := log.WithName("entrypoint")
4141

4242
// Setup a Manager

examples/crd/pkg/groupversion_info.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ package pkg
2020

2121
import (
2222
"k8s.io/apimachinery/pkg/runtime/schema"
23-
logf "sigs.k8s.io/controller-runtime/pkg/runtime/log"
23+
logf "sigs.k8s.io/controller-runtime/pkg/log"
2424
"sigs.k8s.io/controller-runtime/pkg/scheme"
2525
)
2626

pkg/internal/log/log.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17-
// Package log contains utilities for fetching a new logger
18-
// when one is not already available.
19-
// Deprecated: use pkg/log
2017
package log
2118

2219
import (

pkg/log/zap/zap.go

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -37,39 +37,6 @@ func New(opts ...Opts) logr.Logger {
3737
return zapr.NewLogger(NewRaw(opts...))
3838
}
3939

40-
// Logger is a Logger implementation.
41-
// If development is true, a Zap development config will be used
42-
// (stacktraces on warnings, no sampling), otherwise a Zap production
43-
// config will be used (stacktraces on errors, sampling).
44-
//
45-
// Deprecated: use New() and the functional opts pattern instead:
46-
//
47-
// New(UseDevMode(development))
48-
func Logger(development bool) logr.Logger {
49-
return LoggerTo(os.Stderr, development)
50-
}
51-
52-
// LoggerTo returns a new Logger implementation using Zap which logs
53-
// to the given destination, instead of stderr. It otherwise behaves like
54-
// ZapLogger.
55-
//
56-
// Deprecated: use New() and the functional opts pattern instead:
57-
//
58-
// New(UseDevMode(development), WriteTo(writer))
59-
func LoggerTo(destWriter io.Writer, development bool) logr.Logger {
60-
return zapr.NewLogger(RawLoggerTo(destWriter, development))
61-
}
62-
63-
// RawLoggerTo returns a new zap.Logger configured with KubeAwareEncoder
64-
// which logs to a given destination
65-
//
66-
// Deprecated: use NewRaw() and the functional opts pattern instead:
67-
//
68-
// NewRaw(UseDevMode(development), WriteTo(destWriter), RawZapOpts(opts...))
69-
func RawLoggerTo(destWriter io.Writer, development bool, opts ...zap.Option) *zap.Logger {
70-
return NewRaw(UseDevMode(development), WriteTo(destWriter), RawZapOpts(opts...))
71-
}
72-
7340
// Opts allows to manipulate Options
7441
type Opts func(*Options)
7542

pkg/runtime/log/log.go

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

0 commit comments

Comments
 (0)