fix: Fix start-up errors related to plugin-server integration (#257)

Author: CH3CHO

all-in-one/Dockerfile

@@ -1,6 +1,6 @@
 ARG HUB=higress-registry.cn-hangzhou.cr.aliyuncs.com/higress
 ARG BASE_VERSION=2022-10-27T19-02-22
-ARG CORE_VERSION=2.2.1
+ARG CORE_VERSION=2.2.0
 ARG CONSOLE_VERSION=2.2.1
 ARG APISERVER_VERSION=0.0.29
 ARG ENVOY_VERSION=2.2.1
@@ -81,6 +81,6 @@ COPY ./apiserver/config /app/kubeconfig
 COPY ./config /opt/data/defaultConfig
 COPY ./plugin-server/nginx.conf /etc/nginx/plugin-server/nginx.conf
 
-EXPOSE 8080 8443 8001 8002
+EXPOSE 8080 8443 8001
 
 ENTRYPOINT ["supervisord", "-c", "/etc/supervisor/conf.d/supervisord.conf"]

all-in-one/scripts/config-template/ai-gateway.sh

@@ -381,7 +381,7 @@ spec:
   failStrategy: FAIL_OPEN
   phase: UNSPECIFIED_PHASE
   priority: 100
-  url: oci://${PLUGIN_REGISTRY:-higress-registry.cn-hangzhou.cr.aliyuncs.com}/plugins/ai-proxy:2.0.0" >"$WASM_PLUGIN_CONFIG_FOLDER/ai-proxy.internal.yaml"
+  url: http://localhost:8002/plugins/ai-proxy/1.0.0/plugin.wasm" >"$WASM_PLUGIN_CONFIG_FOLDER/ai-proxy.internal.yaml"
 
   echo -e "\
 apiVersion: extensions.higress.io/v1alpha1
@@ -405,7 +405,7 @@ spec:
   failStrategy: FAIL_OPEN
   phase: UNSPECIFIED_PHASE
   priority: 900
-  url: oci://${PLUGIN_REGISTRY:-higress-registry.cn-hangzhou.cr.aliyuncs.com}/plugins/ai-statistics:2.0.0" >"$WASM_PLUGIN_CONFIG_FOLDER/ai-statistics-1.0.0.yaml"
+  url: http://localhost:8002/plugins/ai-statistics/1.0.0/plugin.wasm" >"$WASM_PLUGIN_CONFIG_FOLDER/ai-statistics-1.0.0.yaml"
 
   echo -e "\
 apiVersion: extensions.higress.io/v1alpha1
@@ -429,7 +429,7 @@ spec:
   failStrategy: FAIL_OPEN
   phase: AUTHN
   priority: 900
-  url: oci://${PLUGIN_REGISTRY:-higress-registry.cn-hangzhou.cr.aliyuncs.com}/plugins/model-router:2.0.0" >"$WASM_PLUGIN_CONFIG_FOLDER/model-router.internal.yaml"
+  url: http://localhost:8002/plugins/model-router/1.0.0/plugin.wasm" >"$WASM_PLUGIN_CONFIG_FOLDER/model-router.internal.yaml"
 }
 
 function appendAiProxyConfigs() {

all-in-one/scripts/config-template/ai-proxy.sh

@@ -125,7 +125,7 @@ spec:
   failStrategy: FAIL_OPEN
   phase: UNSPECIFIED_PHASE
   priority: \"100\"
-  url: oci://${PLUGIN_REGISTRY:-higress-registry.cn-hangzhou.cr.aliyuncs.com}/plugins/ai-proxy:2.0.0" > "$WASM_PLUGIN_CONFIG_FILE"
+  url: http://localhost:8002/plugins/ai-proxy/1.0.0/plugin.wasm" > "$WASM_PLUGIN_CONFIG_FILE"
 }
 
 function initializeMcpBridge() {

all-in-one/scripts/start-gateway.sh

@@ -31,5 +31,4 @@ fi
     --domain=higress-system.svc.cluster.local \
     --proxyLogLevel=${GATEWAY_LOG_LEVEL:-warning} \
     --proxyComponentLogLevel=${GATEWAY_COMPONENT_LOG_LEVEL:-misc:error} \
-    --log_output_level=all:info \
     --serviceCluster=higress-gateway

bin/configure.sh

@@ -655,8 +655,8 @@ writeConfiguration() {
 
   # Generate wasm plugin URL variables
   if [ "$USE_PLUGIN_SERVER" == "Y" ]; then
-    WASM_PLUGIN_URL_PATTERN="http://plugin-server:8002/plugins/\${name}/\${version}/plugin.wasm"
-    MCP_SERVER_WASM_URL="http://plugin-server:8002/plugins/mcp-server/1.0.0/plugin.wasm"
+    WASM_PLUGIN_URL_PATTERN="http://plugin-server:8080/plugins/\${name}/\${version}/plugin.wasm"
+    MCP_SERVER_WASM_URL="http://plugin-server:8080/plugins/mcp-server/1.0.0/plugin.wasm"
   else
     WASM_PLUGIN_URL_PATTERN=''
     MCP_SERVER_WASM_URL=''

compose/.env

@@ -9,17 +9,18 @@ NACOS_DATA_ENC_KEY=''
 NACOS_SERVER_TAG='v3.0.1'
 HIGRESS_RUNNER_TAG='0.0.3'
 HIGRESS_API_SERVER_TAG='0.0.29'
-HIGRESS_CONTROLLER_TAG='2.2.1'
-HIGRESS_PILOT_TAG='2.2.1'
-HIGRESS_GATEWAY_TAG='2.2.1'
+HIGRESS_CONTROLLER_TAG='2.2.0'
+HIGRESS_PILOT_TAG='2.2.0'
+HIGRESS_GATEWAY_TAG='2.2.0'
 HIGRESS_CONSOLE_TAG='2.2.1'
 HIGRESS_PLUGIN_SERVER_TAG='2.2.1'
-WASM_PLUGIN_URL_PATTERN='http://plugin-server:8002/plugins/${name}/${version}/plugin.wasm'
-MCP_SERVER_WASM_URL='http://plugin-server:8002/plugins/mcp-server/1.0.0/plugin.wasm'
+WASM_PLUGIN_URL_PATTERN='http://plugin-server:8080/plugins/${name}/${version}/plugin.wasm'
+MCP_SERVER_WASM_URL='http://plugin-server:8080/plugins/mcp-server/1.0.0/plugin.wasm'
 PROMETHEUS_TAG='v2.40.7'
 PROMTAIL_TAG='2.9.4'
 LOKI_TAG='2.9.4'
 GRAFANA_TAG='9.3.6'
+NACOS_CONSOLE_PORT='8888'
 NACOS_HTTP_PORT='8848'
 NACOS_GRPC_PORT='9848'
 GATEWAY_HTTP_PORT='80'

compose/docker-compose.yml

@@ -135,9 +135,6 @@ services:
     depends_on:
       prepare:
         condition: service_completed_successfully
-      plugin-server:
-        condition: service_healthy
-        required: false
     networks:
       higress-net:
         aliases:
@@ -204,6 +201,8 @@ services:
     depends_on:
       pilot:
         condition: service_healthy
+      plugin-server:
+        condition: service_healthy
     networks:
       higress-net:
         aliases:
@@ -237,18 +236,19 @@ services:
     hostname: higress-plugin-server
     image: higress-registry.cn-hangzhou.cr.aliyuncs.com/higress/plugin-server:${HIGRESS_PLUGIN_SERVER_TAG}
     profiles: [ "plugin-server" ]
+    depends_on:
+      prepare:
+        condition: service_completed_successfully
     networks:
       higress-net:
         aliases:
           - plugin-server.svc
     restart: always
     healthcheck:
-      test: [ "CMD-SHELL", "curl -sf http://127.0.0.1:8002/healthz || exit 1" ]
+      test: [ "CMD-SHELL", "curl -sf http://127.0.0.1:8080/ || exit 1" ]
       interval: 1s
       timeout: 3s
       retries: 60
-    volumes:
-      - ./volumes/plugin-server/nginx.conf:/etc/nginx/nginx.conf:ro
 
   console:
     hostname: higress-console

compose/scripts/prepare.sh

@@ -727,67 +727,9 @@ checkO11y() {
   checkGrafana
 }
 
-checkPluginServer() {
-  echo "Checking plugin-server configurations..."
-
-  mkdir -p $VOLUMES_ROOT/plugin-server
-
-  if [ ! -f $VOLUMES_ROOT/plugin-server/nginx.conf ]; then
-    cat <<'EOF' >$VOLUMES_ROOT/plugin-server/nginx.conf
-daemon off;
-user www-data;
-worker_processes auto;
-pid /run/nginx.pid;
-error_log /var/log/nginx/error.log notice;
-
-events {
-    worker_connections 1024;
-}
-
-http {
-    include /etc/nginx/mime.types;
-    default_type application/octet-stream;
-
-    log_format main '$remote_addr - $remote_user [$time_local] "$request" '
-                    '$status $body_bytes_sent "$http_referer" '
-                    '"$http_user_agent"';
-
-    access_log /var/log/nginx/access.log main;
-
-    sendfile on;
-    keepalive_timeout 65;
-
-    server {
-        listen 8002;
-        server_name localhost;
-
-        # Static files root directory
-        root /usr/share/nginx/html;
-
-        # Hide Nginx version
-        server_tokens off;
-
-        # Health check endpoint
-        location = /healthz {
-            return 200 'ok';
-            add_header Content-Type text/plain;
-        }
-
-        # Error pages
-        error_page 500 502 503 504 /50x.html;
-        location = /50x.html {
-            root /usr/share/nginx/html;
-        }
-    }
-}
-EOF
-  fi
-}
-
 checkStorage
 checkPilot
 checkGateway
 checkConsole
 checkGatewayApi
 checkO11y
-checkPluginServer