Skip to content

Commit 714ed72

Browse files
authored
fix(deploy): add NACOS_USERNAME config to install scripts for Higress parity (higress-group#221)
Add NACOS_USERNAME variable (default "nacos") to both Helm and Docker install scripts, making Nacos credential configuration symmetric with Higress which already has HIGRESS_USERNAME. Changes include saved_vars list, interactive prompt, non-interactive defaults, .env persistence, login display, init hooks, and .env.example files. 🤖 Generated with [Qoder][https://qoder.com]
1 parent e8dd915 commit 714ed72

File tree

6 files changed

+15
-6
lines changed

6 files changed

+15
-6
lines changed

deploy/docker/.env.example

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ SANDBOX_IMAGE=opensource-registry.cn-hangzhou.cr.aliyuncs.com/higress-group/sand
2424

2525
# ========== 服务凭证 ==========
2626
# 首次安装时由 install.sh 自动生成随机值,升级时沿用已有值
27+
# NACOS_USERNAME=nacos
2728
# NACOS_ADMIN_PASSWORD=
2829
# HIGRESS_USERNAME=admin
2930
# HIGRESS_PASSWORD=

deploy/docker/hooks/post_ready.d/10-init-nacos-admin.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ if [[ -f "${ENV_FILE}" ]]; then
1111
set -a; . "${ENV_FILE}"; set +a
1212
fi
1313

14+
NACOS_USERNAME="${NACOS_USERNAME:-nacos}"
1415
NACOS_ADMIN_PASSWORD="${NACOS_ADMIN_PASSWORD:-nacos}"
1516

1617
log() { echo "[init-nacos-admin $(date +'%H:%M:%S')] $*"; }
@@ -64,7 +65,7 @@ while (( attempt <= max_attempts )); do
6465
log "请使用已有凭据登录 Nacos Console: http://${NACOS_HOST}:8848/nacos"
6566
else
6667
log "Nacos 管理员密码初始化成功!"
67-
log "用户名: nacos"
68+
log "用户名: ${NACOS_USERNAME}"
6869
log "密码: ${NACOS_ADMIN_PASSWORD}"
6970
log "访问地址: http://${NACOS_HOST}:8848/nacos"
7071
fi

deploy/docker/install.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ load_config() {
384384
MYSQL_IMAGE NACOS_IMAGE HIGRESS_IMAGE REDIS_IMAGE SANDBOX_IMAGE \
385385
MYSQL_ROOT_PASSWORD MYSQL_PASSWORD MYSQL_DATABASE MYSQL_USER \
386386
JWT_SECRET \
387-
NACOS_ADMIN_PASSWORD HIGRESS_USERNAME HIGRESS_PASSWORD \
387+
NACOS_USERNAME NACOS_ADMIN_PASSWORD HIGRESS_USERNAME HIGRESS_PASSWORD \
388388
ADMIN_USERNAME ADMIN_PASSWORD FRONT_USERNAME FRONT_PASSWORD \
389389
HIMARKET_LANGUAGE \
390390
SKIP_HOOK_ERRORS \
@@ -619,6 +619,7 @@ interactive_config() {
619619
# ─── 服务凭证(首次安装时已自动生成随机值) ───
620620
log ""
621621
log "$(msg section.credential)"
622+
prompt NACOS_USERNAME "Nacos admin username" "nacos"
622623
prompt NACOS_ADMIN_PASSWORD "Nacos admin password" "${NACOS_ADMIN_PASSWORD:-}"
623624
prompt HIGRESS_USERNAME "Higress console username" "admin"
624625
prompt HIGRESS_PASSWORD "Higress console password" "${HIGRESS_PASSWORD:-}"
@@ -773,6 +774,7 @@ MYSQL_PASSWORD="${MYSQL_PASSWORD}"
773774
JWT_SECRET="${JWT_SECRET}"
774775
775776
# ========== 服务凭证 ==========
777+
NACOS_USERNAME="${NACOS_USERNAME}"
776778
NACOS_ADMIN_PASSWORD="${NACOS_ADMIN_PASSWORD}"
777779
HIGRESS_USERNAME="${HIGRESS_USERNAME}"
778780
HIGRESS_PASSWORD="${HIGRESS_PASSWORD}"
@@ -897,7 +899,7 @@ show_result_panel() {
897899
log ""
898900
log " Admin login: ${ADMIN_USERNAME} / ${ADMIN_PASSWORD}"
899901
log " Developer login: ${FRONT_USERNAME} / ${FRONT_PASSWORD}"
900-
log " Nacos login: nacos / ${NACOS_ADMIN_PASSWORD:-nacos}"
902+
log " Nacos login: ${NACOS_USERNAME} / ${NACOS_ADMIN_PASSWORD:-nacos}"
901903
log " Higress login: ${HIGRESS_USERNAME} / ${HIGRESS_PASSWORD}"
902904
log ""
903905
if [[ "${SKIP_AI_MODEL_INIT:-true}" != "true" ]]; then

deploy/helm/.env.example

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ HIGRESS_CHART_REF=higress.io/higress
3030

3131
# ========== 服务凭证 ==========
3232
# 首次安装时由 install.sh 自动生成随机值,升级时沿用已有值
33+
# NACOS_USERNAME=nacos
3334
# NACOS_ADMIN_PASSWORD=
3435
# HIGRESS_USERNAME=admin
3536
# HIGRESS_PASSWORD=

deploy/helm/hooks/post_ready.d/10-init-nacos-admin.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ fi
1919

2020
NS="${NAMESPACE:-himarket}"
2121

22+
NACOS_USERNAME="${NACOS_USERNAME:-nacos}"
2223
NACOS_ADMIN_PASSWORD="${NACOS_ADMIN_PASSWORD:-nacos}"
2324

2425
log() { echo "[init-nacos-admin $(date +'%H:%M:%S')] $*"; }
@@ -81,7 +82,7 @@ while (( attempt <= max_attempts )); do
8182
log "请使用已有凭据登录 Nacos Console: http://${NACOS_HOST}:8080/nacos"
8283
else
8384
log "Nacos 管理员密码初始化成功!"
84-
log "用户名: nacos"
85+
log "用户名: ${NACOS_USERNAME}"
8586
log "密码: ${NACOS_ADMIN_PASSWORD}"
8687
log "访问地址: http://${NACOS_HOST}:8080/nacos"
8788
fi

deploy/helm/install.sh

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -539,7 +539,7 @@ load_config() {
539539
HIGRESS_REPO_NAME HIGRESS_REPO_URL HIGRESS_CHART_REF \
540540
MYSQL_ROOT_PASSWORD MYSQL_PASSWORD \
541541
JWT_SECRET \
542-
NACOS_ADMIN_PASSWORD HIGRESS_USERNAME HIGRESS_PASSWORD \
542+
NACOS_USERNAME NACOS_ADMIN_PASSWORD HIGRESS_USERNAME HIGRESS_PASSWORD \
543543
ADMIN_USERNAME ADMIN_PASSWORD FRONT_USERNAME FRONT_PASSWORD \
544544
MYSQL_STORAGE_CLASS MYSQL_STORAGE_SIZE SANDBOX_STORAGE_CLASS SANDBOX_STORAGE_SIZE \
545545
HIGRESS_INGRESS_CLASS HIMARKET_LANGUAGE \
@@ -775,6 +775,7 @@ interactive_config() {
775775
if [[ -z "${JWT_SECRET:-}" ]]; then
776776
JWT_SECRET="$(openssl rand -base64 32)"
777777
fi
778+
NACOS_USERNAME="${NACOS_USERNAME:-nacos}"
778779
NACOS_ADMIN_PASSWORD="${NACOS_ADMIN_PASSWORD:-nacos}"
779780
HIGRESS_USERNAME="${HIGRESS_USERNAME:-admin}"
780781
HIGRESS_PASSWORD="${HIGRESS_PASSWORD:-admin}"
@@ -821,6 +822,7 @@ interactive_config() {
821822
# ─── 服务凭证(首次安装时已自动生成随机值) ───
822823
log ""
823824
log "$(msg section.credential)"
825+
prompt NACOS_USERNAME "Nacos admin username" "nacos"
824826
prompt NACOS_ADMIN_PASSWORD "Nacos admin password" "${NACOS_ADMIN_PASSWORD:-}"
825827
prompt HIGRESS_USERNAME "Higress console username" "admin"
826828
prompt HIGRESS_PASSWORD "Higress console password" "${HIGRESS_PASSWORD:-}"
@@ -1006,6 +1008,7 @@ MYSQL_PASSWORD="${MYSQL_PASSWORD}"
10061008
JWT_SECRET="${JWT_SECRET}"
10071009
10081010
# ========== 服务凭证 ==========
1011+
NACOS_USERNAME="${NACOS_USERNAME}"
10091012
NACOS_ADMIN_PASSWORD="${NACOS_ADMIN_PASSWORD}"
10101013
HIGRESS_USERNAME="${HIGRESS_USERNAME}"
10111014
HIGRESS_PASSWORD="${HIGRESS_PASSWORD}"
@@ -1199,7 +1202,7 @@ show_result_panel() {
11991202
log ""
12001203
log "║ Admin login: ${ADMIN_USERNAME} / ${ADMIN_PASSWORD}"
12011204
log "║ Developer login: ${FRONT_USERNAME} / ${FRONT_PASSWORD}"
1202-
log "║ Nacos login: ${NACOS_USERNAME:-nacos} / ${NACOS_ADMIN_PASSWORD}"
1205+
log "║ Nacos login: ${NACOS_USERNAME} / ${NACOS_ADMIN_PASSWORD}"
12031206
log "║ Higress login: ${HIGRESS_USERNAME} / ${HIGRESS_PASSWORD}"
12041207
log ""
12051208
if [[ "${SKIP_AI_MODEL_INIT:-true}" != "true" ]]; then

0 commit comments

Comments
 (0)