github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 10:51:29 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #108550 from dims/specify-journald-configuration-explicitly

Browse Source 
Explicitly specify journald config so the kube-up deployed nodes retain logs
This commit is contained in:
Kubernetes Prow Robot 2022-03-06 18:46:53 -08:00 committed by GitHub
commit debd461d03
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cluster/gce/gci/configure-helper.sh
View File

@ -505,6 +505,20 @@ function ensure-local-ssds-ephemeral-storage() {
safe-bind-mount "${ephemeral_mountpoint}/log_pods" "/var/log/pods" safe-bind-mount "${ephemeral_mountpoint}/log_pods" "/var/log/pods"
} }
# set journald configuration
function setup-journald() {
if [[ "${SET_JOURNALD_CONFIGURATION:-true}" = "true" ]]; then
cat <<EOF > /etc/systemd/journald.conf
[Journal]
Storage=persistent
SystemMaxUse=1G
SystemMaxFileSize=100M
RuntimeMaxUse=100M
EOF
systemctl restart systemd-journald.service
fi
}
# Installs logrotate configuration files # Installs logrotate configuration files
function setup-logrotate() { function setup-logrotate() {
mkdir -p /etc/logrotate.d/ mkdir -p /etc/logrotate.d/
@ -3410,6 +3424,7 @@ function main() {
log-wrap 'CreateDirs' create-dirs log-wrap 'CreateDirs' create-dirs
log-wrap 'EnsureLocalSSDs' ensure-local-ssds log-wrap 'EnsureLocalSSDs' ensure-local-ssds
log-wrap 'SetupKubeletDir' setup-kubelet-dir log-wrap 'SetupKubeletDir' setup-kubelet-dir
log-wrap 'SetupJournald' setup-journald
log-wrap 'SetupLogrotate' setup-logrotate log-wrap 'SetupLogrotate' setup-logrotate
if [[ "${KUBERNETES_MASTER:-}" == "true" ]]; then if [[ "${KUBERNETES_MASTER:-}" == "true" ]]; then
log-wrap 'MountMasterPD' mount-master-pd log-wrap 'MountMasterPD' mount-master-pd