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

[ubuntu-cluster] fix a serious bug when node both act as master and minion #6060

Merged
merged 1 commit into from
Mar 27, 2015
Merged

[ubuntu-cluster] fix a serious bug when node both act as master and minion #6060

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions cluster/ubuntu-cluster/configure.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,6 @@ do
mm[$i]=$name
let ii++
done
echo

# input node IPs
while true; do
Expand All @@ -168,7 +167,13 @@ while true; do
sed -i "s/MASTER_IP/${masterIP}/g" default_scripts/kube-proxy

# For master set MINION IPs in kube-controller-manager
minionIPs="$minionIPs,$myIP"
if [ -z "$minionIPs" ]; then
#one node act as both minion and master role
minionIPs="$myIP"
else
minionIPs="$minionIPs,$myIP"
fi

sed -i "s/MINION_IPS/${minionIPs}/g" default_scripts/kube-controller-manager

cpMaster
Expand Down