部署脚本选用bcs-apiserver-proxy作为默认高可用方案 #2413 (#2467)

部署脚本集成multus方案#2411
TencentBlueKing · Aug 21, 2023 · ccdae7c · ccdae7c
1 parent 2a8c12a
commit ccdae7c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/bcs-ops/install_master.sh b/bcs-ops/install_master.sh
@@ -76,6 +76,14 @@ if [[ -z ${MASTER_JOIN_CMD:-} ]]; then
       "${ROOT_DIR}"/k8s/operate_kube_vip apply
     elif [[ ${APISERVER_HA_MODE} == "bcs-apiserver-proxy" ]]; then
       "${ROOT_DIR}"/k8s/operate_bap apply
+    else
+      "${ROOT_DIR}"/k8s/operate_bap apply
+    fi
+  fi
+
+  if [[ ${ENABLE_MULTUS_HA} == "true" ]]; then
+    if ! "${ROOT_DIR}"/k8s/operate_multus apply;then
+      utils::log "FATAL" "fail to apply multus"
     fi
   fi
 else

diff --git a/bcs-ops/system/config_envfile.sh b/bcs-ops/system/config_envfile.sh
@@ -128,6 +128,8 @@ init_env() {
   KUBE_VIP_VERSION=${KUBE_VIP_VERSION:-"v0.5.12"}
   BIND_INTERFACE=${BIND_INTERFACE:-}
   VIP_CIDR=${VIP_CIDR:-"32"}
+  ## multus
+  ENABLE_MULTUS_HA=${ENABLE_MULTUS_HA:-"true"}
 }
 
 source_cluster_env() {
@@ -288,6 +290,8 @@ DEBUG_MODE="${DEBUG_MODE}"
 KUBE_VIP_VERSION="${KUBE_VIP_VERSION}"
 BIND_INTERFACE="${BIND_INTERFACE}"
 VIP_CIDR="${VIP_CIDR}"
+## multus
+ENABLE_MULTUS_HA="${ENABLE_MULTUS_HA}"
 # bcs config end
 EOF
 }