feat: Integrate the new landing page support (#119)

higress-group · Jan 6, 2025 · db2f2df · db2f2df
1 parent ad3afa9
commit db2f2df
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 11 deletions.
diff --git a/all-in-one/scripts/start-console.sh b/all-in-one/scripts/start-console.sh
@@ -31,5 +31,7 @@ if [ "$O11Y" == "on" ]; then
 fi
 
 HIGRESS_CONSOLE_KUBE_CONFIG="/app/kubeconfig" \
+    HIGRESS_CONSOLE_SERVICE_HOST="higress-console.static" \
+    HIGRESS_CONSOLE_SERVICE_PORT=80 \
     SERVER_PORT="$CONSOLE_PORT" \
     bash /app/start.sh
diff --git a/compose/docker-compose.yml b/compose/docker-compose.yml
@@ -11,7 +11,9 @@ services:
     env_file:
       - ./env/nacos.env
     networks:
-      - higress-net
+      higress-net:
+        aliases:
+          - nacos.svc
     healthcheck:
       test: [ "CMD", "curl", "-f", "http://127.0.0.1:8848/nacos" ]
       interval: 1s
@@ -81,7 +83,9 @@ services:
       precheck:
         condition: service_completed_successfully
     networks:
-      - higress-net
+      higress-net:
+        aliases:
+          - apiserver.svc
     restart: always
     healthcheck:
       test: [ "CMD", "curl", "-fk", "https://127.0.0.1:8443/readyz" ]
@@ -123,7 +127,9 @@ services:
       prepare:
         condition: service_completed_successfully
     networks:
-      - higress-net
+      higress-net:
+        aliases:
+          - higress.svc
     restart: always
     healthcheck:
       test: [ "CMD", "curl", "-f", "http://127.0.0.1:8888/ready" ]
@@ -152,7 +158,9 @@ services:
     env_file:
       - ./env/pilot.env
     networks:
-      - higress-net
+      higress-net:
+        aliases:
+          - pilot.svc
     restart: always
     healthcheck:
       test: [ "CMD", "curl", "-fk", "http://127.0.0.1:8080/ready" ]
@@ -181,7 +189,9 @@ services:
       pilot:
         condition: service_healthy
     networks:
-      - higress-net
+      higress-net:
+        aliases:
+          - gateway.svc
     restart: always
     ports:
       - "${GATEWAY_HTTP_PORT:-80}:80/tcp"
@@ -213,7 +223,9 @@ services:
       controller:
         condition: service_healthy
     networks:
-      - higress-net
+      higress-net:
+        aliases:
+          - console.svc
     ports:
       - "${CONSOLE_PORT:-8080}:8080/tcp"
     healthcheck:
@@ -242,7 +254,9 @@ services:
       gateway:
         condition: service_healthy
     networks:
-      - higress-net
+      higress-net:
+        aliases:
+          - prometheus.svc
     healthcheck:
       test:
         [
@@ -273,7 +287,9 @@ services:
       loki:
         condition: service_healthy
     networks:
-      - higress-net
+      higress-net:
+        aliases:
+          - promtail.svc
     ports:
       - "3101:3101/tcp"
     healthcheck:
@@ -301,7 +317,9 @@ services:
       - -config.file=/etc/loki/config/config.yaml
       - -target=all
     networks:
-      - higress-net
+      higress-net:
+        aliases:
+          - loki.svc
     ports:
       - "3100:3100/tcp"
     healthcheck:
@@ -330,7 +348,9 @@ services:
       loki:
         condition: service_healthy
     networks:
-      - higress-net
+      higress-net:
+        aliases:
+          - grafana.svc
     ports:
       - "3000:3000/tcp" 
     healthcheck:

diff --git a/compose/env/console.env b/compose/env/console.env
@@ -5,4 +5,6 @@ HIGRESS_CONSOLE_CONTROLLER_SERVICE_HOST=pilot
 HIGRESS_CONSOLE_CONTROLLER_ACCESS_TOKEN=
 HIGRESS_CONSOLE_DASHBOARD_BASE_URL=http://grafana:3000/grafana
 HIGRESS_CONSOLE_DASHBOARD_DATASOURCE_PROM_URL=http://prometheus:9090/prometheus
-HIGRESS_CONSOLE_DASHBOARD_DATASOURCE_LOKI_URL=http://loki:3100
+HIGRESS_CONSOLE_DASHBOARD_DATASOURCE_LOKI_URL=http://loki:3100
+HIGRESS_CONSOLE_SERVICE_HOST=higress-console.dns
+HIGRESS_CONSOLE_SERVICE_PORT=8080
diff --git a/compose/scripts/prepare.sh b/compose/scripts/prepare.sh
@@ -127,6 +127,10 @@ metadata:
   namespace: higress-system
 spec:
   registries:
+  - domain: console.svc
+    name: higress-console
+    port: 8080
+    type: dns
 EOF
 
   if [ "$CONFIG_STORAGE" == "nacos" ]; then