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

Fix for default systemd startup of the kublet, also forcing the hard

Browse Source 
requirement for the parameter.  Sans parameter the kubelet will fail
silently trying to obtain service setting that are placed into the
ENV of the PODS.
This commit is contained in:
Timothy St. Clair 2015-02-19 20:10:24 -06:00
parent 2b5641deb8
commit 604df04a9b
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
contrib/init/systemd/environ/kubelet
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=""

2
contrib/init/systemd/kubelet.service
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 \

4
pkg/kubelet/server/server.go
View File

@ -165,7 +165,9 @@ func (s *KubeletServer) Run(_ []string) error {
//
// TODO(erictune): convert all cloud provider scripts and Google Container Engine to
// use only --api_servers, then delete --etcd_servers flag and the resulting dead code.
if len(s.EtcdServerList) > 0 && len(s.APIServerList) > 0 {
if len(s.APIServerList) == 0 {
glog.Fatalf("--api_server is required.")
} else if len(s.EtcdServerList) >0 {
glog.Infof("Both --etcd_servers and --api_servers are set. Not using etcd source.")
s.EtcdServerList = util.StringList{}
}