github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-07 11:13:48 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #14718 from gmarek/small_fixes

Browse Source 
Small fixes to Kubemark scripts
This commit is contained in:
Marek Grabowski 2015-09-29 10:37:07 +02:00
commit 9d49e143dc
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/images/kubemark/build-kubemark.sh
View File

@ -29,6 +29,6 @@ cp kubernetes/server/bin/kubemark /
cp kubernetes/server/bin/kubectl / cp kubernetes/server/bin/kubectl /
rm -rf /tmp/* rm -rf /tmp/*
apt-get remove -y build-essential apt-get remove -y build-essential
apt-get clean -y apt-get clean -y
apt-get autoremove -y apt-get autoremove -y

3
cmd/kubelet/app/server.go
View File

@ -1,5 +1,5 @@
/* /*
Copyright 2014 The Kubernetes Authors All rights reserved. Copyright 2015 The Kubernetes Authors All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.
@ -602,7 +602,6 @@ func SimpleKubelet(client *client.Client,
fileCheckFrequency, httpCheckFrequency, minimumGCAge, nodeStatusUpdateFrequency, syncFrequency time.Duration, fileCheckFrequency, httpCheckFrequency, minimumGCAge, nodeStatusUpdateFrequency, syncFrequency time.Duration,
maxPods int, maxPods int,
) *KubeletConfig { ) *KubeletConfig {
imageGCPolicy := kubelet.ImageGCPolicy{ imageGCPolicy := kubelet.ImageGCPolicy{
HighThresholdPercent: 90, HighThresholdPercent: 90,
LowThresholdPercent: 80, LowThresholdPercent: 80,

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

@ -18,7 +18,7 @@
sudo docker run --net=host -d gcr.io/google_containers/etcd:2.0.12 /usr/local/bin/etcd --addr=127.0.0.1:4001 --bind-addr=0.0.0.0:4001 --data-dir=/var/etcd/data sudo docker run --net=host -d gcr.io/google_containers/etcd:2.0.12 /usr/local/bin/etcd --addr=127.0.0.1:4001 --bind-addr=0.0.0.0:4001 --data-dir=/var/etcd/data
# Increase the allowed number of open file descriptors # Increase the allowed number of open file descriptors
+ulimit -n 65536 ulimit -n 65536
tar xzf kubernetes-server-linux-amd64.tar.gz tar xzf kubernetes-server-linux-amd64.tar.gz