mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-27 13:37:30 +00:00
Merge pull request #6060 from ZJU-SEL/hotfix
[ubuntu-cluster] fix a serious bug when node both act as master and minion
This commit is contained in:
commit
308049e789
@ -143,7 +143,6 @@ do
|
|||||||
mm[$i]=$name
|
mm[$i]=$name
|
||||||
let ii++
|
let ii++
|
||||||
done
|
done
|
||||||
echo
|
|
||||||
|
|
||||||
# input node IPs
|
# input node IPs
|
||||||
while true; do
|
while true; do
|
||||||
@ -168,7 +167,13 @@ while true; do
|
|||||||
sed -i "s/MASTER_IP/${masterIP}/g" default_scripts/kube-proxy
|
sed -i "s/MASTER_IP/${masterIP}/g" default_scripts/kube-proxy
|
||||||
|
|
||||||
# For master set MINION IPs in kube-controller-manager
|
# 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
|
sed -i "s/MINION_IPS/${minionIPs}/g" default_scripts/kube-controller-manager
|
||||||
|
|
||||||
cpMaster
|
cpMaster
|
||||||
|
Loading…
Reference in New Issue
Block a user