diff --git a/cluster/gce/config-default.sh b/cluster/gce/config-default.sh index 34753dc7a5a..a7e057927de 100755 --- a/cluster/gce/config-default.sh +++ b/cluster/gce/config-default.sh @@ -415,6 +415,14 @@ if [[ -n "${LOGROTATE_MAX_SIZE:-}" ]]; then PROVIDER_VARS="${PROVIDER_VARS:-} LOGROTATE_MAX_SIZE" fi +if [[ -n "${POD_LOG_MAX_FILE:-}" ]]; then + PROVIDER_VARS="${PROVIDER_VARS:-} POD_LOG_MAX_FILE" +fi + +if [[ -n "${POD_LOG_MAX_SIZE:-}" ]]; then + PROVIDER_VARS="${PROVIDER_VARS:-} POD_LOG_MAX_SIZE" +fi + # Fluentd requirements # YAML exists to trigger a configuration refresh when changes are made. FLUENTD_GCP_YAML_VERSION="v3.2.0" diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh index cce1b431edb..9fbfac7a4a7 100755 --- a/cluster/gce/config-test.sh +++ b/cluster/gce/config-test.sh @@ -432,6 +432,14 @@ if [[ -n "${LOGROTATE_MAX_SIZE:-}" ]]; then PROVIDER_VARS="${PROVIDER_VARS:-} LOGROTATE_MAX_SIZE" fi +if [[ -n "${POD_LOG_MAX_FILE:-}" ]]; then + PROVIDER_VARS="${PROVIDER_VARS:-} POD_LOG_MAX_FILE" +fi + +if [[ -n "${POD_LOG_MAX_SIZE:-}" ]]; then + PROVIDER_VARS="${PROVIDER_VARS:-} POD_LOG_MAX_SIZE" +fi + # Fluentd requirements # YAML exists to trigger a configuration refresh when changes are made. FLUENTD_GCP_YAML_VERSION="v3.2.0" diff --git a/cluster/gce/gci/configure-helper.sh b/cluster/gce/gci/configure-helper.sh index a2e429f6a44..de00f1ae606 100644 --- a/cluster/gce/gci/configure-helper.sh +++ b/cluster/gce/gci/configure-helper.sh @@ -374,6 +374,21 @@ function setup-logrotate() { } EOF + # Configure log rotation for pod logs in /var/log/pods/NAMESPACE_NAME_UID. + cat > /etc/logrotate.d/allpodlogs <