[+] 支持 etcd

init-k3s.sh

@@ -3,6 +3,7 @@
 current_ip=$(hostname -I | awk '{print $1}')
 
 # 镜像加速
+mkdir /etc/rancher/k3s -p
 cat <<EOF > /etc/rancher/k3s/registries.yaml
 mirrors:
   docker.io:
@@ -24,12 +25,6 @@ mirrors:
       - https://docker.martin98.com/v2/quay
 EOF
 
-
-curl -sfL https://rancher-mirror.rancher.cn/k3s/k3s-install.sh | INSTALL_K3S_MIRROR=cn sh -s - \
-  --cluster-cidr $pod_subnet \
-  --service-cidr $service_subnet \
-  --node-external-ip=$vip_ip
-
 # 安装 keepalived
 apt install -y keepalived
 
@@ -57,34 +52,29 @@ vrrp_instance VI_1 {
 EOF
 sudo systemctl restart keepalived
 systemctl status keepalived &
-echo "初始化 master VIP[$state] $current_ip 成功"
 
 
-#cat /var/lib/rancher/k3s/server/node-token
-#
-#
-#
-#curl -sfL https://rancher-mirror.rancher.cn/k3s/k3s-install.sh | \
-#  INSTALL_K3S_MIRROR=cn \
-#  K3S_URL=https://myserver:6443 \
-#  K3S_TOKEN=mynodetoken sh -
-#cat <<EOF
-#------------------------------------------------------------------------------------
-#初始化 master $current_ip 成功
-#$OUTPUT
-#
-## master 加入
-#kubeadm join $vip_ip:6443 \\
-#  --token $TOKEN \\
-#  --discovery-token-ca-cert-hash $TOKEN_HASH \\
-#  --control-plane --certificate-key $CERTS
-#
-## worker 加入
-#kubeadm join $vip_ip:6443 \\
-#  --token $TOKEN \\
-#  --discovery-token-ca-cert-hash $TOKEN_HASH
-#
-#------------------------------------------------------------------------------------
-#EOF
-#
-#kubectl get nodes
+
+# 开始部署
+curl -sfL https://rancher-mirror.rancher.cn/k3s/k3s-install.sh | INSTALL_K3S_MIRROR=cn sh -s - server \
+    --cluster-init \
+    --cluster-cidr $pod_subnet \
+    --service-cidr $service_subnet \
+    --node-external-ip=$vip_ip \
+    --tls-san=$vip_ip
+
+kubectl get nodes
+
+TOKEN=$(cat /var/lib/rancher/k3s/server/node-token)
+
+cat <<EOF
+------------------------------------------------------------------------------------
+初始化 master VIP[$state] $current_ip 成功
+
+# 加入节点
+
+curl -sfL https://rancher-mirror.rancher.cn/k3s/k3s-install.sh | K3S_TOKEN=$TOKEN sh -s - server \
+    --server https://$vip_ip:6443 \
+    --tls-san=$vip_ip
+------------------------------------------------------------------------------------
+EOF