From e5e691ed5ff259da7505d863165eceda3f3fc23a Mon Sep 17 00:00:00 2001 From: derekwaynecarr Date: Thu, 11 Feb 2016 14:04:16 -0500 Subject: [PATCH] Default lockfile to empty string while alpha --- cmd/kubelet/app/options/options.go | 2 +- docs/admin/kubelet.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/kubelet/app/options/options.go b/cmd/kubelet/app/options/options.go index e4c767525ea..1eb5dfff642 100644 --- a/cmd/kubelet/app/options/options.go +++ b/cmd/kubelet/app/options/options.go @@ -103,7 +103,7 @@ func NewKubeletServer() *KubeletServer { NodeStatusUpdateFrequency: unversioned.Duration{10 * time.Second}, NodeLabels: make(map[string]string), OOMScoreAdj: qos.KubeletOOMScoreAdj, - LockFilePath: "/var/run/lock/kubelet.lock", + LockFilePath: "", PodInfraContainerImage: kubetypes.PodInfraContainerImage, Port: ports.KubeletPort, ReadOnlyPort: ports.KubeletReadOnlyPort, diff --git a/docs/admin/kubelet.md b/docs/admin/kubelet.md index 9d46c25a72b..12546964f8a 100644 --- a/docs/admin/kubelet.md +++ b/docs/admin/kubelet.md @@ -105,7 +105,7 @@ kubelet --kube-reserved=: A set of ResourceName=ResourceQuantity (e.g. cpu=200m,memory=150G) pairs that describe resources reserved for kubernetes system components. Currently only cpu and memory are supported. See http://releases.k8s.io/HEAD/docs/user-guide/compute-resources.html for more detail. [default=none] --kubeconfig="/var/lib/kubelet/kubeconfig": Path to a kubeconfig file, specifying how to authenticate to API server (the master location is set by the api-servers flag). --kubelet-cgroups="": Optional absolute name of cgroups to create and run the Kubelet in. - --lock-file="/var/run/lock/kubelet.lock": The path to file for kubelet to use as a lock file. + --lock-file="": The path to file for kubelet to use as a lock file. --log-flush-frequency=5s: Maximum number of seconds between log flushes --low-diskspace-threshold-mb=256: The absolute free disk space, in MB, to maintain. When disk space falls below this threshold, new pods would be rejected. Default: 256 --manifest-url="": URL for accessing the container manifest @@ -151,7 +151,7 @@ kubelet --volume-stats-agg-period=1m0s: Specifies interval for kubelet to calculate and cache the volume disk usage for all pods and volumes. To disable volume calculations, set to 0. Default: '1m' ``` -###### Auto generated by spf13/cobra on 10-Feb-2016 +###### Auto generated by spf13/cobra on 12-Feb-2016