github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #37217 from kubernetes/revert-37095-kubemark_logrotation

Browse Source 
Revert "Add log rotation to kubemark"
This commit is contained in:
Wojciech Tyczynski 2016-11-21 15:38:18 +01:00 committed by GitHub
commit 75108a3757
3 changed files with 0 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
test/kubemark/resources/kubemark_logrotate
View File

@ -1,19 +0,0 @@
compress
/var/log/kube-apiserver.log {
rotate 12
copytruncate
size 100M
}
/var/log/kube-scheduler.log {
rotate 12
copytruncate
size 100M
}
/var/log/kube-controller-manager.log {
rotate 12
copytruncate
size 100M
}

3
test/kubemark/start-kubemark-master.sh
View File

@ -111,9 +111,6 @@ retry sudo docker run --net=host \
--listen-client-urls=http://0.0.0.0:2379 \ --listen-client-urls=http://0.0.0.0:2379 \
--data-dir=/var/etcd/data ${ETCD_QUOTA_BYTES} 1>> /var/log/etcd.log 2>&1" --data-dir=/var/etcd/data ${ETCD_QUOTA_BYTES} 1>> /var/log/etcd.log 2>&1"
# Run logrotate regularly
echo '*/5 * * * * root logrotate /etc/logrotate.conf' >> "/etc/crontab"
# Increase the allowed number of open file descriptors # Increase the allowed number of open file descriptors
ulimit -n 65536 ulimit -n 65536

5
test/kubemark/start-kubemark.sh
View File

@ -170,11 +170,6 @@ gcloud compute copy-files --zone="${ZONE}" --project="${PROJECT}" \
"${RESOURCE_DIRECTORY}/controllers_flags" \ "${RESOURCE_DIRECTORY}/controllers_flags" \
"${MASTER_NAME}":~ "${MASTER_NAME}":~
gcloud compute copy-files --zone="${ZONE}" --project="${PROJECT}" \
"${RESOURCE_DIRECTORY}/kubemark_logrotate" \
"root@${MASTER_NAME}:/etc/logrotate.d"
gcloud compute ssh "${MASTER_NAME}" --zone="${ZONE}" --project="${PROJECT}" \ gcloud compute ssh "${MASTER_NAME}" --zone="${ZONE}" --project="${PROJECT}" \
--command="chmod a+x configure-kubectl.sh && chmod a+x start-kubemark-master.sh && \ --command="chmod a+x configure-kubectl.sh && chmod a+x start-kubemark-master.sh && \
sudo ./start-kubemark-master.sh ${EVENT_STORE_IP:-127.0.0.1} ${NUM_NODES:-0} ${EVENT_PD:-false} ${ETCD_IMAGE:-}" sudo ./start-kubemark-master.sh ${EVENT_STORE_IP:-127.0.0.1} ${NUM_NODES:-0} ${EVENT_PD:-false} ${ETCD_IMAGE:-}"