From ccdae7cdfe4aee0af274ee56824f99da15902788 Mon Sep 17 00:00:00 2001
From: lmtan <359150423@qq.com>
Date: Mon, 21 Aug 2023 14:28:22 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E7=BD=B2=E8=84=9A=E6=9C=AC=E9=80=89?=
 =?UTF-8?q?=E7=94=A8bcs-apiserver-proxy=E4=BD=9C=E4=B8=BA=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E9=AB=98=E5=8F=AF=E7=94=A8=E6=96=B9=E6=A1=88=20#2413?=
 =?UTF-8?q?=20(#2467)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

部署脚本集成multus方案#2411
---
 bcs-ops/install_master.sh        | 8 ++++++++
 bcs-ops/system/config_envfile.sh | 4 ++++
 2 files changed, 12 insertions(+)

diff --git a/bcs-ops/install_master.sh b/bcs-ops/install_master.sh
index 3402e97fc1..bef6ed481c 100755
--- 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
index cd885acf3f..d9d44b95fc 100755
--- 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
 }