Skip to content

Commit c01fcf6

Browse files
committed
loose numcpu count for VZ
1 parent a5140fb commit c01fcf6

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

manifest.jps

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ actions:
9696
systemctl daemon-reload > /dev/null 2>&1
9797
entryPoint=$((( ${nodes.mbl.length:0} > 0 )) && echo mbl || echo k8sm)
9898
sed -i "s/^controlPlaneEndpoint:.*/controlPlaneEndpoint: \"${entryPoint}.${env.domain}:6443\"/g" /etc/kubernetes/custom-kubeadm.yaml
99-
kubeadm init --config /etc/kubernetes/custom-kubeadm.yaml --upload-certs --ignore-preflight-errors=swap | tee /var/log/kubeadm-init.log
99+
kubeadm init --config /etc/kubernetes/custom-kubeadm.yaml --upload-certs --ignore-preflight-errors=swap,numcpu | tee /var/log/kubeadm-init.log
100100
sed -n '/kubeadm join/,/^$/{/./p}' /var/log/kubeadm-init.log | sed ':a;N;$!ba;s/\\\n//g' | grep 'control-plane' > /var/lib/connect/settings-master
101101
sed -n '/kubeadm join/,/^$/{/./p}' /var/log/kubeadm-init.log | sed ':a;N;$!ba;s/\\\n//g' | grep -v 'control-plane' > /var/lib/connect/settings
102102
printf "0 1 * * * kubeadm token create --print-join-command > /var/lib/connect/settings\n\n\n" > /var/spool/cron/root
@@ -108,7 +108,7 @@ actions:
108108
init-slave-master:
109109
- cmd[${this.id}]: |-
110110
systemctl daemon-reload > /dev/null 2>&1
111-
$(cat /var/lib/connect/settings-master) --ignore-preflight-errors=swap > /dev/null 2>&1
111+
$(cat /var/lib/connect/settings-master) --ignore-preflight-errors=swap,numcpu > /dev/null 2>&1
112112
- configure-master: ${this.id}
113113
- cmd[mbl]: |-
114114
echo '${this.ip}' >> /etc/haproxy/hosts
@@ -137,7 +137,7 @@ actions:
137137
rm -f /etc/machine-id
138138
systemd-machine-id-setup
139139
systemctl daemon-reload > /dev/null 2>&1
140-
$(cat /var/lib/connect/settings) --ignore-preflight-errors=swap > /dev/null 2>&1
140+
$(cat /var/lib/connect/settings) --ignore-preflight-errors=swap,numcpu > /dev/null 2>&1
141141
sleep 5
142142
iptables -I INPUT -m conntrack --ctstate ESTABLISHED,RELATED -j ACCEPT
143143
service iptables save

0 commit comments

Comments
 (0)