Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ubuntu-distro: Kubelet and kube-proxy talk to apiserver not etcd. #5245

Merged
merged 2 commits into from
Mar 16, 2015
Merged

Ubuntu-distro: Kubelet and kube-proxy talk to apiserver not etcd. #5245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8d20282
Kubelet and kube-proxy talk to apiserver not etcd.
erictune Mar 10, 2015
2255e6f
Fix ubuntu-cluster to use apiserver not etcd.
erictune Mar 12, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions cluster/ubuntu-cluster/configure.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,8 @@ do
item="$name=http://$i:2380"
if [ "$ii" == 1 ]; then
cluster=$item
#record the masterIP for later use.
masterIP=$i
else
cluster="$cluster,$item"
if [ "$ii" -gt 2 ]; then
Expand Down Expand Up @@ -162,6 +164,8 @@ while true; do
configEtcd $etcdName $myIP $cluster
# For minion set MINION IP in default_scripts/kubelet
sed -i "s/MY_IP/${myIP}/g" default_scripts/kubelet
sed -i "s/MASTER_IP/${masterIP}/g" default_scripts/kubelet
sed -i "s/MASTER_IP/${masterIP}/g" default_scripts/kube-proxy

# For master set MINION IPs in kube-controller-manager
minionIPs="$minionIPs,$myIP"
Expand Down
2 changes: 1 addition & 1 deletion cluster/ubuntu-cluster/default_scripts/kube-proxy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# KUBE_PROXY="/opt/bin/kube-proxy"

# Use KUBE_PROXY_OPTS to modify the start/restart options
KUBE_PROXY_OPTS="--etcd_servers=http://127.0.0.1:4001 \
KUBE_PROXY_OPTS="--master=http://MASTER_IP:8080 \
--logtostderr=true"

# Add more envionrment settings used by kube-apiserver here
2 changes: 1 addition & 1 deletion cluster/ubuntu-cluster/default_scripts/kubelet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
KUBELET_OPTS="--address=0.0.0.0 \
--port=10250 \
--hostname_override=MY_IP \
--etcd_servers=http://127.0.0.1:4001 \
--api_servers=http://MASTER_IP:8080 \
--logtostderr=true"

# Add more envionrment settings used by kube-scheduler here
2 changes: 1 addition & 1 deletion cluster/ubuntu/default_scripts/kube-proxy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# KUBE_PROXY="/opt/bin/kube-proxy"

# Use KUBE_PROXY_OPTS to modify the start/restart options
KUBE_PROXY_OPTS="--etcd_servers=http://127.0.0.1:4001 \
KUBE_PROXY_OPTS="--master=http://127.0.0.1:8080 \
--logtostderr=true"

# Add more envionrment settings used by kube-apiserver here
2 changes: 1 addition & 1 deletion cluster/ubuntu/default_scripts/kubelet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
KUBELET_OPTS="--address=127.0.0.1 \
--port=10250 \
--hostname_override=127.0.0.1 \
--etcd_servers=http://127.0.0.1:4001 \
--api_servers=http://127.0.0.1:8080 \
--logtostderr=true"

# Add more envionrment settings used by kube-scheduler here