Merge pull request kubernetes#102389 from CaoDonghui123/automated-che…

…rry-pick-of-#99680-upstream-release-1.21

Automated cherry pick of kubernetes#99680: fix error of setting  negative value for containerLogMaxSize

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,