From 7cfb3479e07b496eca2317fc411138805b005cb8 Mon Sep 17 00:00:00 2001 From: gmarek Date: Tue, 1 Sep 2015 15:35:38 +0200 Subject: [PATCH] Small fixes to Kubemark scripts --- cluster/images/kubemark/build-kubemark.sh | 2 +- cmd/kubelet/app/server.go | 3 +-- test/kubemark/start-kubemark-master.sh | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/cluster/images/kubemark/build-kubemark.sh b/cluster/images/kubemark/build-kubemark.sh index cc1b40270a..ea5c041ab1 100755 --- a/cluster/images/kubemark/build-kubemark.sh +++ b/cluster/images/kubemark/build-kubemark.sh @@ -29,6 +29,6 @@ cp kubernetes/server/bin/kubemark / cp kubernetes/server/bin/kubectl / rm -rf /tmp/* -apt-get remove -y build-essential +apt-get remove -y build-essential apt-get clean -y apt-get autoremove -y diff --git a/cmd/kubelet/app/server.go b/cmd/kubelet/app/server.go index 60a959c206..1a226ed624 100644 --- a/cmd/kubelet/app/server.go +++ b/cmd/kubelet/app/server.go @@ -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"); 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, maxPods int, ) *KubeletConfig { - imageGCPolicy := kubelet.ImageGCPolicy{ HighThresholdPercent: 90, LowThresholdPercent: 80, diff --git a/test/kubemark/start-kubemark-master.sh b/test/kubemark/start-kubemark-master.sh index b1319fa07d..ba7de8c1a8 100644 --- a/test/kubemark/start-kubemark-master.sh +++ b/test/kubemark/start-kubemark-master.sh @@ -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 # Increase the allowed number of open file descriptors -+ulimit -n 65536 +ulimit -n 65536 tar xzf kubernetes-server-linux-amd64.tar.gz