Merge pull request #24 from jianxiaoguo/main

chore(workflow): modify install.sh uninstall.sh

Author: duanhongyi

_scripts/install.sh

@@ -147,14 +147,16 @@ function install_components {
   check_metallb
   helm repo update
   echo -e "\\033[32m---> Waiting for helm to install components...\\033[0m"
-  api_server=(`kubectl config view -o=jsonpath='{.clusters[0].cluster.server}' | tr "://" " "`)
+  api_server_address=(`ip -o route get to 8.8.8.8 | sed -n 's/.*src \([0-9.]\+\).*/\1/p'`)
   helm install cilium drycc/cilium \
     --set tunnel=geneve \
     --set operator.replicas=1 \
     --set bandwidthManager=true \
     --set kubeProxyReplacement=strict \
-    --set k8sServiceHost=${api_server[1]} \
-    --set k8sServicePort=${api_server[2]} \
+    --set k8sServiceHost=${KUBE_API_SERVER_ADDRESS:-$api_server_address} \
+    --set k8sServicePort=${KUBE_API_SERVER_PORT:-"6443"} \
+    --set global.containerRuntime.integration="containerd" \
+    --set global.containerRuntime.socketPath="/var/run/k3s/containerd/containerd.sock" \
     --set hostPort.enabled=true \
     --namespace kube-system --wait
 

_scripts/uninstall.sh

@@ -3,7 +3,14 @@ set -eo pipefail
 shopt -s expand_aliases
 
 /usr/local/bin/k3s-killall.sh
-/usr/local/bin/k3s-uninstall.sh
+
+if [[ -x /usr/local/bin/k3s-uninstall.sh ]] ; then
+    /usr/local/bin/k3s-uninstall.sh
+fi
+
+if [[ -x /usr/local/bin/k3s-agent-uninstall.sh ]] ; then
+    /usr/local/bin/k3s-agent-uninstall.sh
+fi
 
 if [[ -n "${K3S_DATA_DIR}" ]] ; then
     rm -rf  "${K3S_DATA_DIR}/rancher"

src/quickstart/install-workflow.md

@@ -178,6 +178,8 @@ DRYCC_ADMIN_PASSWORD                       | Required item, specify drycc's admi
 CERT_MANAGER_ENABLED                       | Whether to use automatic certificate. It is `true` by default
 CHANNEL                                    | By default, `stable` channel will be installed. You can also specify `testing`
 REGISTRIES_FILE                            | The `registers.yaml` file path used by drycc registry
+KUBE_API_SERVER_ADDRESS                    | Set with the IP address of the loadbalancer that was in front of kube-apiserver, The default is the IP address of the current node
+KUBE_API_SERVER_PORT                       | Set with the PORT of the loadbalancer that was in front of kube-apiserver, which is `6443` by default
 METALLB_CONFIG_FILE                        | The metallb config file path, layer 2 network is used by default
 INSTALL_DRYCC_MIRROR                       | Specify the accelerated mirror location. Currently, only `cn` is supported
 CONTROLLER_APP_STORAGE_CLASS               | StorageClass allocated by `drycc volumes`; default storageClass is used by default