Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

部署脚本集成multus方案#2411 #2456

Closed
wants to merge 11 commits into from
Closed

部署脚本集成multus方案#2411 #2456

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
d29d9af
部署脚本集成multus方案#2411
denglouping Aug 21, 2023
8f8546c
部署脚本选用bcs-apiserver-proxy作为默认高可用方案 #2413
denglouping Aug 21, 2023
839e30d
添加env ENABLE_MULTUS_HA初始化
denglouping Aug 21, 2023
e97fa5c
部署脚本集成multus方案#2411
denglouping Aug 21, 2023
644d8d9
Merge branch 'master' of https://github.com/denglouping/bk-bcs
denglouping Aug 21, 2023
ebd5653
Merge branch 'TencentBlueKing:master' into master
denglouping Aug 21, 2023
b00709a
添加env ENABLE_MULTUS_HA初始化
denglouping Aug 21, 2023
b6a016a
cluster-resource pod下容器列表新增initContainer (#2438)
LidolLxf Aug 21, 2023
7d301e0
修复 SDK API 版本匹配问题 (#2464)
AlkaidChan Aug 21, 2023
84dedc1
fix golangci-lint problems (#2428)
AlkaidChan Aug 21, 2023
4f87266
Merge branch 'master' of https://github.com/denglouping/bk-bcs
denglouping Aug 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions bcs-ops/install_master.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions bcs-ops/system/config_envfile.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down Expand Up @@ -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
}
Expand Down