From f9d8212ff9e5a703d693fa88c74398bbf95a183f Mon Sep 17 00:00:00 2001 From: Avesh Agarwal Date: Mon, 25 May 2015 11:25:16 -0400 Subject: [PATCH] Updating systemd service and enviorn files for controller-manager as --machines is deprecated. --- contrib/init/systemd/environ/controller-manager | 3 --- contrib/init/systemd/kube-controller-manager.service | 1 - .../fedora/fedora_manual_config.md | 9 --------- 3 files changed, 13 deletions(-) diff --git a/contrib/init/systemd/environ/controller-manager b/contrib/init/systemd/environ/controller-manager index afc76b52171..1a9e3f204c9 100644 --- a/contrib/init/systemd/environ/controller-manager +++ b/contrib/init/systemd/environ/controller-manager @@ -3,8 +3,5 @@ # defaults from config and apiserver should be adequate -# Comma separated list of minions -KUBELET_ADDRESSES="--machines=127.0.0.1" - # Add your own! KUBE_CONTROLLER_MANAGER_ARGS="" diff --git a/contrib/init/systemd/kube-controller-manager.service b/contrib/init/systemd/kube-controller-manager.service index 3c135154095..e3e76741573 100644 --- a/contrib/init/systemd/kube-controller-manager.service +++ b/contrib/init/systemd/kube-controller-manager.service @@ -9,7 +9,6 @@ User=kube ExecStart=/usr/bin/kube-controller-manager \ $KUBE_LOGTOSTDERR \ $KUBE_LOG_LEVEL \ - $KUBELET_ADDRESSES \ $KUBE_MASTER \ $KUBE_CONTROLLER_MANAGER_ARGS Restart=on-failure diff --git a/docs/getting-started-guides/fedora/fedora_manual_config.md b/docs/getting-started-guides/fedora/fedora_manual_config.md index 138f5800641..fe1c1d828cc 100644 --- a/docs/getting-started-guides/fedora/fedora_manual_config.md +++ b/docs/getting-started-guides/fedora/fedora_manual_config.md @@ -77,15 +77,6 @@ KUBE_SERVICE_ADDRESSES="--portal_net=10.254.0.0/16" KUBE_API_ARGS="" ``` -* *Optional* Edit /etc/kubernetes/controller-manager and remove --machines=127.0.0.1 from the KUBELET_ADDRESSES. Leaving this in won't hurt anything but it will cause the output to note that the 127.0.0.1 node is NotReady because we will not be configuring one in this guide. - -``` -KUBELET_ADDRESSES="" - -KUBE_CONTROLLER_MANAGER_ARGS="" -``` - - * Edit /etc/etcd/etcd.conf,let the etcd to listen all the ip instead of 127.0.0.1, if not, you will get the error like "connection refused" ``` ETCD_LISTEN_CLIENT_URLS="http://0.0.0.0:4001"