[#49] 增加no bind版本server & client pkg, 完成h20 部署测试和重启测试

deployment_new/build/make_client_gpu_package.sh

@@ -82,16 +82,13 @@ AGENT_USER=
 AGENT_INSTANCE=
 GPU_NODE_HOSTNAME=
 
+# Overlay network (should match server包 overlay)
+ARGUS_OVERLAY_NET=argus-sys-net
+
 # From cluster-info.env (server package output)
-BINDIP=
-FTPIP=
 SWARM_MANAGER_ADDR=
 SWARM_JOIN_TOKEN_WORKER=
 SWARM_JOIN_TOKEN_MANAGER=
-
-# FTP defaults
-FTP_USER=ftpuser
-FTP_PASSWORD=NASPlab1234!
 EOF
 
 # 4) Docs from deployment_new templates

deployment_new/build/make_server_package.sh

@@ -33,11 +33,9 @@ if [[ -z "$VERSION" ]]; then VERSION="$(today_version)"; fi
 require_cmd docker tar gzip awk sed
 
 IMAGES=(
-  argus-bind9
   argus-master
   argus-elasticsearch
   argus-kibana
-  argus-metric-ftp
   argus-metric-prometheus
   argus-metric-grafana
   argus-alertmanager
@@ -73,11 +71,9 @@ cat >"$ENV_EX" <<EOF
 PKG_VERSION=$VERSION
 
 # Image tags (can be overridden). Default to versioned tags
-BIND_IMAGE_TAG=argus-bind9:
 MASTER_IMAGE_TAG=argus-master:
 ES_IMAGE_TAG=argus-elasticsearch:
 KIBANA_IMAGE_TAG=argus-kibana:
-FTP_IMAGE_TAG=argus-metric-ftp:
 PROM_IMAGE_TAG=argus-metric-prometheus:
 GRAFANA_IMAGE_TAG=argus-metric-grafana:
 ALERT_IMAGE_TAG=argus-alertmanager:
@@ -106,10 +102,6 @@ WEB_PROXY_PORT_8085=8085
 # Overlay network name
 ARGUS_OVERLAY_NET=argus-sys-net
 
-# FTP defaults
-FTP_USER=ftpuser
-FTP_PASSWORD=NASPlab1234!
-
 # UID/GID for volume ownership
 ARGUS_BUILD_UID=2133
 ARGUS_BUILD_GID=2015
@@ -148,7 +140,6 @@ mkdir -p \
   "$STAGE/private/argus/metric/grafana/data/sessions" \
   "$STAGE/private/argus/metric/grafana/data/dashboards" \
   "$STAGE/private/argus/metric/grafana/config" \
-  "$STAGE/private/argus/metric/ftp" \
   "$STAGE/private/argus/alert/alertmanager" \
   "$STAGE/private/argus/log/elasticsearch" \
   "$STAGE/private/argus/log/kibana"