From a06ed1244e24832aa5929c28d2e87f6224228b91 Mon Sep 17 00:00:00 2001 From: caodonghui Date: Wed, 3 Mar 2021 14:00:39 +0800 Subject: [PATCH] fix error of setting negative value for containerLogMaxSize --- pkg/kubelet/logs/container_log_manager.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkg/kubelet/logs/container_log_manager.go b/pkg/kubelet/logs/container_log_manager.go index 56e4f31169d..d746d258f02 100644 --- a/pkg/kubelet/logs/container_log_manager.go +++ b/pkg/kubelet/logs/container_log_manager.go @@ -138,9 +138,6 @@ func parseMaxSize(size string) (int64, error) { if !ok { return 0, fmt.Errorf("invalid max log size") } - if maxSize < 0 { - return 0, fmt.Errorf("negative max log size %d", maxSize) - } return maxSize, nil } @@ -161,6 +158,10 @@ func NewContainerLogManager(runtimeService internalapi.RuntimeService, osInterfa if err != nil { return nil, fmt.Errorf("failed to parse container log max size %q: %v", maxSize, err) } + // Negative number means to disable container log rotation + if parsedMaxSize < 0 { + return NewStubContainerLogManager(), nil + } // policy LogRotatePolicy return &containerLogManager{ osInterface: osInterface,