Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for container-log-max-size/files with kubelet #10612

Merged
merged 1 commit into from
Jan 20, 2021

Conversation

hakman
Copy link
Member

@hakman hakman commented Jan 20, 2021

Adding log rotation and log retention options for containerd:
xRef: kubernetes/kubernetes#59898

Kubelet defaults:

	if obj.ContainerLogMaxSize == "" {
		obj.ContainerLogMaxSize = "10Mi"
	}
	if obj.ContainerLogMaxFiles == nil {
		obj.ContainerLogMaxFiles = utilpointer.Int32Ptr(5)
	}

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jan 20, 2021
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hakman

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added area/api approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Jan 20, 2021
@hakman hakman changed the title Add flags for container-log-max-size/files to kubelet Add support for container-log-max-size/files with kubelet Jan 20, 2021
@hakman hakman force-pushed the cri-container-log-max branch from 2f4416f to 51cc462 Compare January 20, 2021 03:50
@olemarkus
Copy link
Member

/lgtm

Thanks for this

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 20, 2021
@k8s-ci-robot k8s-ci-robot merged commit 05488e4 into kubernetes:master Jan 20, 2021
@k8s-ci-robot k8s-ci-robot added this to the v1.20 milestone Jan 20, 2021
@hakman hakman deleted the cri-container-log-max branch January 20, 2021 16:04
@hakman
Copy link
Member Author

hakman commented Jan 20, 2021

My pleasure @olemarkus. Let me know if you need it in 1.19 also.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/api cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants