Merge pull request #4643 from timothysc/apiserver-ENV

Fix for failed ENV injection (missing startup parameter)
This commit is contained in:
Victor Marmol 2015-02-20 10:25:14 -08:00
commit affe11246e
2 changed files with 4 additions and 1 deletions

View File

@ -10,5 +10,8 @@ KUBELET_PORT="--port=10250"
# You may leave this blank to use the actual hostname
KUBELET_HOSTNAME="--hostname_override=127.0.0.1"
# location of the api-server
KUBELET_API_SERVER="--api_server=127.0.0.1:8080"
# Add your own!
KUBELET_ARGS=""

View File

@ -11,7 +11,7 @@ EnvironmentFile=-/etc/kubernetes/kubelet
ExecStart=/usr/bin/kubelet \
$KUBE_LOGTOSTDERR \
$KUBE_LOG_LEVEL \
$KUBE_ETCD_SERVERS \
$KUBELET_API_SERVER \
$KUBELET_ADDRESS \
$KUBELET_PORT \
$KUBELET_HOSTNAME \