diff --git a/README.md b/README.md index d0357c5..7162a44 100644 --- a/README.md +++ b/README.md @@ -75,7 +75,8 @@ BOOTSTRAP_REGISTRY_USER=admin-or-user BOOTSTRAP_REGISTRY_PASS=change-me BOOTSTRAP_REGISTRY_INSECURE=false -# Kubernetes 集群 bootstrap,名称列表用逗号分隔 +# Kubernetes 集群 bootstrap,需要显式启用并设置名称列表 +BOOTSTRAP_ENABLE_CLUSTERS=true BOOTSTRAP_CLUSTERS=cluster1,cluster2 BOOTSTRAP_CLUSTER_CLUSTER1_HOST=https://x.x.x.x:6443 BOOTSTRAP_CLUSTER_CLUSTER1_DESC=GPU Cluster 1 diff --git a/backend/internal/bootstrap/config.go b/backend/internal/bootstrap/config.go index 73270f9..15d6e76 100644 --- a/backend/internal/bootstrap/config.go +++ b/backend/internal/bootstrap/config.go @@ -138,7 +138,9 @@ func loadBootstrapConfigFromEnv() (*BootstrapConfig, bool) { }) } - if parseBoolEnv("BOOTSTRAP_ENABLE_CLUSTERS", false) { + enableClusters := parseBoolEnv("BOOTSTRAP_ENABLE_CLUSTERS", false) || + os.Getenv("BOOTSTRAP_CLUSTERS") != "" + if enableClusters { for _, clusterName := range discoverBootstrapClusters() { prefix := "BOOTSTRAP_CLUSTER_" + normalizeEnvName(clusterName) + "_" host := os.Getenv(prefix + "HOST") diff --git a/docker-compose.yml b/docker-compose.yml index 981b624..08be3fc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -28,6 +28,7 @@ services: - "${POSTGRES_PORT:-15432}:5432" volumes: - postgres_data:/var/lib/postgresql/data + - ./backend/scripts/init-db.sql:/docker-entrypoint-initdb.d/01-init.sql:ro healthcheck: test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER:-postgres} -d ${POSTGRES_DB:-ocdp}"] interval: 10s