github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #76958 from yujuhong/docker-logs

Browse Source 
GCE/Windows: Configure Docker to rotate container logs
This commit is contained in:
Kubernetes Prow Robot 2019-04-23 20:28:12 -07:00 committed by GitHub
commit c669b216dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cluster/gce/windows/configure.ps1
View File

@ -115,6 +115,7 @@ try {
InstallAndStart-LoggingAgent InstallAndStart-LoggingAgent
Create-DockerRegistryKey Create-DockerRegistryKey
Configure-Dockerd
DownloadAndInstall-KubernetesBinaries DownloadAndInstall-KubernetesBinaries
Create-NodePki Create-NodePki
Create-KubeletKubeconfig Create-KubeletKubeconfig

15
cluster/gce/windows/k8s-node-setup.psm1
View File

@ -1058,6 +1058,21 @@ function Create-DockerRegistryKey {
Remove-Item -Force -Recurse ${tmp_dir} Remove-Item -Force -Recurse ${tmp_dir}
} }
# Configure Docker daemon and restart the service.
function Configure-Dockerd {
Set-Content "C:\ProgramData\docker\config\daemon.json" @'
{
"log-driver": "json-file",
"log-opts": {
"max-size": "1m",
"max-file": "5"
}
}
'@
Restart-Service Docker
}
# TODO(pjh): move the Stackdriver logging agent code below into a separate # TODO(pjh): move the Stackdriver logging agent code below into a separate
# module; it was put here temporarily to avoid disrupting the file layout in # module; it was put here temporarily to avoid disrupting the file layout in
# the K8s release machinery. # the K8s release machinery.