From 8557c476238692ec28dee97a4ca285e0dc86f9d7 Mon Sep 17 00:00:00 2001 From: Alex Crawford Date: Fri, 7 Aug 2015 14:50:46 -0700 Subject: [PATCH] app-admin/kubelet: update with better defaults --- .../app-admin/kubelet/files/kubelet.service | 18 ++++++++---------- ...1.0.1-r2.ebuild => kubelet-1.0.1-r3.ebuild} | 0 2 files changed, 8 insertions(+), 10 deletions(-) rename sdk_container/src/third_party/coreos-overlay/app-admin/kubelet/{kubelet-1.0.1-r2.ebuild => kubelet-1.0.1-r3.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/kubelet/files/kubelet.service b/sdk_container/src/third_party/coreos-overlay/app-admin/kubelet/files/kubelet.service index 59e0253824..76c3fa5554 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-admin/kubelet/files/kubelet.service +++ b/sdk_container/src/third_party/coreos-overlay/app-admin/kubelet/files/kubelet.service @@ -3,18 +3,16 @@ Description=Kubernetes Kubelet Documentation=https://github.com/GoogleCloudPlatform/kubernetes [Service] -Environment=ADDRESS=127.0.0.1 -Environment=API_SERVERS=http://127.0.0.1:8080 -Environment=ALLOW_PRIVILEGED=false -Environment=CONFIG=/etc/kubernetes/manifests -Environment=LOGGING=2 +Environment=KUBELET_OPTS= ExecStart=/usr/bin/kubelet \ - --address=${ADDRESS} \ - --api-servers=${API_SERVERS} \ - --allow-privileged=${ALLOW_PRIVILEGED} \ - --config=${CONFIG} \ - --v=${LOGGING} + --address=127.0.0.1 \ + --api-servers=http://127.0.0.1:8080 \ + --allow-privileged=false \ + --config=/etc/kubernetes/manifests \ + --v=2 \ + --cadvisor-port=0 \ + ${KUBELET_OPTS} Restart=on-failure RestartSec=5 diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/kubelet/kubelet-1.0.1-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/kubelet/kubelet-1.0.1-r3.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-admin/kubelet/kubelet-1.0.1-r2.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-admin/kubelet/kubelet-1.0.1-r3.ebuild