Update README.md

2026-02-26 05:30:50 +08:00 · 2025-05-14 17:46:51 +08:00
849 changed files with 8534 additions and 74393 deletions
--- a/.github/ISSUE_TEMPLATE/non--crash-security--bug.md
+++ b/.github/ISSUE_TEMPLATE/non--crash-security--bug.md
@@ -35,15 +35,9 @@ Just paste your stack trace here!

 ### Ⅴ. Anything else we need to know?

-> It is recommended to provided Higress runtime logs and configurations for us to investigate your issue, especially for controller and gateway components.
-> 
-> Please checkout following documents on how to obtain these data.
-> - https://higress.cn/docs/latest/ops/how-tos/view-logs/
-> - https://higress.cn/docs/latest/ops/how-tos/view-configs/
-

 ### Ⅵ. Environment:

 - Higress version:  
- OS: 
- Others: 
+- OS :
+- Others:
--- a/.github/workflows/build-and-push-wasm-plugin-image.yaml
+++ b/.github/workflows/build-and-push-wasm-plugin-image.yaml
@@ -3,22 +3,22 @@ name: Build and Push Wasm Plugin Image
 on:
  push:
    tags:
-      - "wasm-*-*-v*.*.*" # 匹配 wasm-{go|rust}-{pluginName}-vX.Y.Z 格式的标签
+    - "wasm-*-*-v*.*.*" # 匹配 wasm-{go|rust}-{pluginName}-vX.Y.Z 格式的标签
  workflow_dispatch:
    inputs:
      plugin_type:
-        description: "Type of the plugin"
+        description: 'Type of the plugin'
        required: true
        type: choice
        options:
          - go
          - rust
      plugin_name:
-        description: "Name of the plugin"
+        description: 'Name of the plugin'
        required: true
        type: string
      version:
-        description: "Version of the plugin (optional, without leading v)"
+        description: 'Version of the plugin (optional, without leading v)'
        required: false
        type: string

@@ -31,7 +31,8 @@ jobs:
      IMAGE_REGISTRY_SERVICE: ${{ vars.IMAGE_REGISTRY || 'higress-registry.cn-hangzhou.cr.aliyuncs.com' }}
      IMAGE_REPOSITORY: ${{ vars.PLUGIN_IMAGE_REPOSITORY || 'plugins' }}
      RUST_VERSION: 1.82
-      GO_VERSION: 1.24.0
+      GO_VERSION: 1.19
+      TINYGO_VERSION: 0.28.1
      ORAS_VERSION: 1.0.0
    steps:
      - name: Set plugin_type, plugin_name and version from inputs or ref_name
@@ -52,7 +53,7 @@ jobs:
          if [[ "$plugin_type" == "rust" ]]; then
            builder_image="higress-registry.cn-hangzhou.cr.aliyuncs.com/plugins/wasm-rust-builder:rust${{ env.RUST_VERSION }}-oras${{ env.ORAS_VERSION }}"
          else
-            builder_image="higress-registry.cn-hangzhou.cr.aliyuncs.com/plugins/wasm-go-builder:go${{ env.GO_VERSION }}-oras${{ env.ORAS_VERSION }}"
+            builder_image="higress-registry.cn-hangzhou.cr.aliyuncs.com/plugins/wasm-go-builder:go${{ env.GO_VERSION }}-tinygo${{ env.TINYGO_VERSION }}-oras${{ env.ORAS_VERSION }}"
          fi
          echo "PLUGIN_TYPE=$plugin_type" >> $GITHUB_ENV
          echo "PLUGIN_NAME=$plugin_name" >> $GITHUB_ENV
@@ -61,9 +62,9 @@ jobs:

      - name: Checkout code
        uses: actions/checkout@v3
-
+      
      - name: File Check
-        run: |
+        run: | 
          workspace=${{ github.workspace }}/plugins/wasm-${PLUGIN_TYPE}/extensions/${PLUGIN_NAME}
          push_command="./plugin.tar.gz:application/vnd.oci.image.layer.v1.tar+gzip"

@@ -78,7 +79,7 @@ jobs:
              echo "README.md exists"
              push_command="./README.md:application/vnd.module.wasm.doc.v1+markdown $push_command "
          fi
-
+          
          # 查找README_{lang}.md
          for file in ${workspace}/README_*.md; do
            if [ -f "$file" ]; then
@@ -90,9 +91,9 @@ jobs:
          done

          echo "PUSH_COMMAND=\"$push_command\"" >> $GITHUB_ENV
-
+        
      - name: Run a wasm-builder
-        env:
+        env: 
          PLUGIN_NAME: ${{ env.PLUGIN_NAME }}
          BUILDER_IMAGE: ${{ env.BUILDER_IMAGE }}
        run: |
@@ -103,7 +104,7 @@ jobs:
          push_command=${{ env.PUSH_COMMAND }}
          push_command=${push_command#\"}
          push_command=${push_command%\"} # 删除PUSH_COMMAND中的双引号，确保oras push正常解析
-
+          
          target_image="${{ env.IMAGE_REGISTRY_SERVICE }}/${{ env.IMAGE_REPOSITORY}}/${{ env.PLUGIN_NAME }}:${{ env.VERSION }}"
          target_image_latest="${{ env.IMAGE_REGISTRY_SERVICE }}/${{ env.IMAGE_REPOSITORY}}/${{ env.PLUGIN_NAME }}:latest"
          echo "TargetImage=${target_image}"
@@ -122,7 +123,7 @@ jobs:
          set -e
          cd /workspace/plugins/wasm-go/extensions/${PLUGIN_NAME}
          go mod tidy
-          GOOS=wasip1 GOARCH=wasm go build -buildmode=c-shared -o plugin.wasm .
+          tinygo build -o ./plugin.wasm -scheduler=none -target=wasi -gc=custom -tags=\"custommalloc nottinygc_finalizer ${EXTRA_TAGS}\" .
          tar czvf plugin.tar.gz plugin.wasm
          echo ${{ secrets.REGISTRY_PASSWORD }} | oras login -u ${{ secrets.REGISTRY_USERNAME }} --password-stdin ${{ env.IMAGE_REGISTRY_SERVICE }}
          oras push ${target_image} ${push_command}
--- a/.github/workflows/build-and-test-plugin.yaml
+++ b/.github/workflows/build-and-test-plugin.yaml
@@ -2,20 +2,20 @@ name: "Build and Test Plugins"

 on:
  push:
-    branches: [main]
+    branches: [ main ]
    paths:
-      - "plugins/**"
-      - "test/**"
-      - "helm/**"
-      - "Makefile.core.mk"
+      - 'plugins/**'
+      - 'test/**'
+      - 'helm/**'
+      - 'Makefile.core.mk'
  pull_request:
-    branches: ["*"]
+    branches: [ "*" ]
    paths:
-      - "plugins/**"
-      - "test/**"
-      - "helm/**"
-      - "Makefile.core.mk"
-  workflow_dispatch: ~
+      - 'plugins/**'
+      - 'test/**'
+      - 'helm/**'
+      - 'Makefile.core.mk'
+  workflow_dispatch: ~      

 jobs:
  lint:
@@ -24,7 +24,7 @@ jobs:
      - uses: actions/checkout@v4
      - uses: actions/setup-go@v5
        with:
-          go-version: 1.24
+          go-version: 1.22
    # There are too many lint errors in current code bases
    # uncomment when we decide what lint should be addressed or ignored.
    # - run: make lint
@@ -34,7 +34,7 @@ jobs:
    strategy:
      matrix:
        # TODO(Xunzhuo): Enable C WASM Filters in CI
-        wasmPluginType: [GO, RUST]
+        wasmPluginType: [ GO, RUST ]
    steps:
      - uses: actions/checkout@v4

@@ -46,12 +46,12 @@ jobs:
          dotnet: true
          haskell: true
          large-packages: true
-          swap-storage: true
+          swap-storage: true      

      - name: "Setup Go"
        uses: actions/setup-go@v5
        with:
-          go-version: 1.24
+          go-version: 1.22

      - name: Setup Rust
        uses: actions-rs/toolchain@v1
@@ -80,6 +80,6 @@ jobs:

  publish:
    runs-on: ubuntu-latest
-    needs: [higress-wasmplugin-test]
+    needs: [ higress-wasmplugin-test ]
    steps:
      - uses: actions/checkout@v4
--- a/.github/workflows/deploy-standalone-to-oss.yaml
+++ b/.github/workflows/deploy-standalone-to-oss.yaml
@@ -29,7 +29,7 @@ jobs:
          echo "Version=$VERSION"
      # Step 3
      - name: Upload to OSS
-        uses: go-choppy/ossutil-github-action@master
+        uses: doggycool/ossutil-github-action@master
        with:
          ossArgs: 'cp -r -u ./artifact/ oss://higress-website-cn-hongkong/standalone/'
          accessKey: ${{ secrets.ACCESS_KEYID }}
--- a/.github/workflows/deploy-to-oss.yaml
+++ b/.github/workflows/deploy-to-oss.yaml
@@ -17,7 +17,7 @@ jobs:
        uses: actions/checkout@v4
      # Step 2
      - name: Download Helm Charts Index
-        uses: go-choppy/ossutil-github-action@master
+        uses: doggycool/ossutil-github-action@master
        with:
          ossArgs: 'cp oss://higress-website-cn-hongkong/helm-charts/index.yaml ./artifact/'
          accessKey: ${{ secrets.ACCESS_KEYID }}
@@ -46,7 +46,7 @@ jobs:
            sed -i 's/higress\.io/higress\.cn/g' ./artifact/cn-index.yaml
      # Step 5
      - name: Upload to OSS
-        uses: go-choppy/ossutil-github-action@master
+        uses: doggycool/ossutil-github-action@master
        with:
          ossArgs: 'cp -r -u ./artifact/ oss://higress-website-cn-hongkong/helm-charts/'
          accessKey: ${{ secrets.ACCESS_KEYID }}
--- a/.github/workflows/generate-release-notes.yaml
+++ b/.github/workflows/generate-release-notes.yaml
@@ -1,265 +0,0 @@
-name: Generate Release Notes
-
-on:
-  push:
-    tags:
-      - "v*.*.*"
-  workflow_dispatch: ~
-
-jobs:
-  generate-release-notes:
-    runs-on: ubuntu-latest
-    env:
-      DASHSCOPE_API_KEY: ${{ secrets.HIGRESS_OPENAI_API_KEY }}
-      MODEL_NAME: ${{ secrets.HIGRESS_OPENAI_API_MODEL }}
-      MODEL_SERVER: ${{ secrets.MODEL_SERVER }}
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Setup Go
-        uses: actions/setup-go@v5
-        with:
-          go-version: 1.24
-
-      - name: Clone GitHub MCP Server
-        run: |
-          git clone https://github.com/github/github-mcp-server.git
-          cd github-mcp-server
-          git checkout 5904a0365ec11f661ecea5c255e86860d279f3b1
-          go build -o ../github-mcp-serve ./cmd/github-mcp-server
-          cd ..
-          chmod u+x github-mcp-serve
-
-      - name: Setup Python
-        uses: actions/setup-python@v4
-        with:
-          python-version: "3.10"
-
-      - name: Clone Higress Report Agent
-        run: |
-          git clone https://github.com/higress-group/higress-report-agent.git
-          mv github-mcp-serve higress-report-agent/
-
-      - name: Clean up old release notes
-        run: |
-          RELEASE_VERSION=$(cat ${GITHUB_WORKSPACE}/VERSION)
-          CLEAN_VERSION=${RELEASE_VERSION#v}
-          if [ -d "release-notes/${CLEAN_VERSION}" ]; then
-              echo "Removing old release notes directory: release-notes/${CLEAN_VERSION}"
-              rm -rf release-notes/${CLEAN_VERSION}
-          else
-              echo "No old release notes directory found for version ${CLEAN_VERSION}."
-          fi
-          
-      - name: Create Release Report Script
-        run: |
-          cat > generate_release_report.sh << 'EOF'
-          #!/bin/bash
-          # Script to generate release notes for Higress projects
-
-          echo "Fetching GitHub generated release notes for ${GITHUB_REPO_OWNER}/${GITHUB_REPO_NAME}..."
-          curl -L \
-              "https://github.com/${GITHUB_REPO_OWNER}/${GITHUB_REPO_NAME}/releases/tag/${RELEASE_VERSION}" \
-              -o release_page.html
-
-          # Extract system prompt content from HTML
-          echo "Extracting system prompt content..."
-          pip install beautifulsoup4 markdownify
-          SYSTEM_PROMPT=$(python3 -c "
-          import sys
-          from bs4 import BeautifulSoup
-          from markdownify import markdownify
-
-          with open('release_page.html', 'r') as f:
-              soup = BeautifulSoup(f, 'html.parser')
-          
-          system_prompt_header = soup.find('h2', string='system prompt')
-          if system_prompt_header:
-              content = []
-              for sibling in system_prompt_header.next_siblings:
-                  if sibling.name == 'h2':
-                      break
-                  content.append(str(sibling))
-              html_content = ''.join(content).strip()
-              # Convert HTML to Markdown
-              if html_content:
-                  markdown_content = markdownify(html_content)
-                  print(markdown_content.strip())
-              else:
-                  print('')
-          else:
-              print('')
-          ")
-          if [ -z "${SYSTEM_PROMPT}" ]; then
-              echo "No system prompt found in release notes."
-          else
-              echo "System prompt content: ${SYSTEM_PROMPT}"
-          fi
-
-          echo "Extracting PR numbers from ${GITHUB_REPO_OWNER}/${GITHUB_REPO_NAME} release notes..."
-          PR_NUMS=$(cat release_page.html | grep -o "/${GITHUB_REPO_OWNER}/${GITHUB_REPO_NAME}/pull/[0-9]*" | grep -o "[0-9]*$" | sort -n | uniq | tr '\n' ',')
-          PR_NUMS=${PR_NUMS%,}
-          if [ -z "${PR_NUMS}" ]; then
-              echo "No PR numbers found in release notes for ${GITHUB_REPO_OWNER}/${GITHUB_REPO_NAME} tag=${RELEASE_VERSION}."
-              rm release_page.html
-              exit 0
-          fi
-
-          echo "Identifying important PRs..."
-          IMPORTANT_PR_NUMS=$(cat release_page.html | grep -o "<strong>.*/${GITHUB_REPO_OWNER}/${GITHUB_REPO_NAME}/pull/[0-9]*.*</strong>" | grep -o "pull/[0-9]*" | grep -o "[0-9]*" | sort -n | uniq | tr '\n' ',')
-          IMPORTANT_PR_NUMS=${IMPORTANT_PR_NUMS%,}
-
-          rm release_page.html
-
-          echo "Extracted PR numbers for ${GITHUB_REPO_OWNER}/${GITHUB_REPO_NAME}: ${PR_NUMS}"
-          echo "Important PR numbers: ${IMPORTANT_PR_NUMS}"
-
-          echo "Generating detailed release notes for ${GITHUB_REPO_OWNER}/${GITHUB_REPO_NAME}..."
-          cd higress-report-agent
-          pip install uv
-          uv sync
-
-          # Build command
-          CMD_ARGS="--mode 2 --choice 2 --pr_nums ${PR_NUMS}"
-          if [ -n "${IMPORTANT_PR_NUMS}" ]; then
-              CMD_ARGS="${CMD_ARGS} --important_prs ${IMPORTANT_PR_NUMS}"
-          fi
-          if [ -n "${SYSTEM_PROMPT}" ]; then
-              echo "${SYSTEM_PROMPT}" > temp_system_prompt.txt
-              CMD_ARGS="${CMD_ARGS} --sys_prompt_file temp_system_prompt.txt"
-          fi
-
-          uv run report_main.py ${CMD_ARGS}
-
-          # Clean up temporary file
-          if [ -f "temp_system_prompt.txt" ]; then
-              rm temp_system_prompt.txt
-          fi
-
-          cp report.md ../
-          cp report.EN.md ../
-          cd ..
-
-          # 去除主库版本号前缀v，以主库版本号为路径
-          CLEAN_VERSION=${MAIN_RELEASE_VERSION#v}
-
-          echo "Creating release notes directory for main version ${MAIN_RELEASE_VERSION}..."
-          mkdir -p release-notes/${CLEAN_VERSION}
-
-          echo "# ${REPORT_TITLE}" >>release-notes/${CLEAN_VERSION}/README_ZH.md
-          sed 's/# Release Notes//' report.md >>release-notes/${CLEAN_VERSION}/README_ZH.md
-          echo -e "\n" >>release-notes/${CLEAN_VERSION}/README_ZH.md
-
-          echo "# ${REPORT_TITLE}" >>release-notes/${CLEAN_VERSION}/README.md
-          sed 's/# Release Notes//' report.EN.md >>release-notes/${CLEAN_VERSION}/README.md
-          echo -e "\n" >>release-notes/${CLEAN_VERSION}/README.md
-
-          rm report.md
-          rm report.EN.md
-          echo "${REPORT_TITLE} release notes saved to release-notes/${CLEAN_VERSION}/"
-
-          EOF
-          chmod +x generate_release_report.sh
-
-      - name: Generate Release Notes for Higress
-        env:
-          GITHUB_REPO_OWNER: alibaba
-          GITHUB_REPO_NAME: higress
-          GITHUB_PERSONAL_ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          REPORT_TITLE: Higress
-        run: |
-          export MAIN_RELEASE_VERSION=$(cat ${GITHUB_WORKSPACE}/VERSION)
-          export RELEASE_VERSION=$(cat ${GITHUB_WORKSPACE}/VERSION)
-          bash generate_release_report.sh
-
-      - name: Generate Release Notes for Higress Console
-        env:
-          GITHUB_REPO_OWNER: higress-group
-          GITHUB_REPO_NAME: higress-console
-          GITHUB_PERSONAL_ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          REPORT_TITLE: Higress Console
-        run: |
-          export MAIN_RELEASE_VERSION=$(cat ${GITHUB_WORKSPACE}/VERSION)
-          export RELEASE_VERSION=$(grep "^higress-console:" ${GITHUB_WORKSPACE}/DEP_VERSION | head -n1 | sed 's/higress-console: //')
-          bash generate_release_report.sh
-
-      - name: Create Update Release Notes Script
-        run: |
-          cat > update_release_note.sh << 'EOF'
-          #!/bin/bash
-          CLEAN_VERSION=${RELEASE_VERSION#v}
-
-          RELEASE_INFO=$(curl -s -L \
-              -H "Accept: application/vnd.github+json" \
-              -H "Authorization: Bearer ${GITHUB_TOKEN}" \
-              -H "X-GitHub-Api-Version: 2022-11-28" \
-              https://api.github.com/repos/${GITHUB_REPO_OWNER}/${GITHUB_REPO_NAME}/releases/tags/${RELEASE_VERSION})
-          RELEASE_ID=$(echo $RELEASE_INFO | jq -r .id)
-
-          RELEASE_BODY=$(echo $RELEASE_INFO | jq -r .body)
-          NEW_CONTRIBUTORS=$(echo "$RELEASE_BODY" | awk '/## New Contributors/{flag=1; next} /\*\*Full Changelog\*\*/{flag=0} flag' | sed 's/\\n/\n/g')
-          FULL_CHANGELOG=$(echo "$RELEASE_BODY" | awk '/\*\*Full Changelog\*\*:/{print $0}' | sed 's/\*\*Full Changelog\*\*: //g' | sed 's/\\n/\n/g')
-
-          RELEASE_NOTES=$(cat release-notes/${CLEAN_VERSION}/README.md | sed 's/# /## /g')
-
-          if [[ -n "$NEW_CONTRIBUTORS" ]]; then
-              RELEASE_NOTES="${RELEASE_NOTES}
-
-          ## New Contributors
-
-          ${NEW_CONTRIBUTORS}"
-          fi
-          if [[ -n "$FULL_CHANGELOG" ]]; then
-              RELEASE_NOTES="${RELEASE_NOTES}
-
-          **Full Changelog**: ${FULL_CHANGELOG}"
-          fi
-
-          JSON_DATA=$(jq -n \
-              --arg body "$RELEASE_NOTES" \
-              '{body: $body}')
-
-          curl -L \
-              -X PATCH \
-              -H "Accept: application/vnd.github+json" \
-              -H "Authorization: Bearer ${GITHUB_TOKEN}" \
-              -H "X-GitHub-Api-Version: 2022-11-28" \
-              https://api.github.com/repos/${GITHUB_REPO_OWNER}/${GITHUB_REPO_NAME}/releases/${RELEASE_ID} \
-              -d "$JSON_DATA"
-
-          EOF
-          chmod +x update_release_note.sh
-
-      - name: Update Release Notes
-        env:
-          GITHUB_REPO_OWNER: alibaba
-          GITHUB_REPO_NAME: higress
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          export RELEASE_VERSION=$(cat ${GITHUB_WORKSPACE}/VERSION)
-          bash update_release_note.sh
-
-      - name: Clean
-        run: |
-          rm generate_release_report.sh
-          rm update_release_note.sh
-          rm -rf higress-report-agent
-          rm -rf github-mcp-server
-
-      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v7
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          commit-message: "Add release notes"
-          branch: add-release-notes
-          title: "Add release notes"
-          body: |
-            This PR adds release notes.
-
-            - Automatically generated by GitHub Actions
-          labels: release notes, automated
-          base: main
--- a/.github/workflows/helm-docs.yaml
+++ b/.github/workflows/helm-docs.yaml
@@ -39,3 +39,126 @@ jobs:
          fi
          git diff --exit-code
          rm -f ./helm-docs
+
+  translate-readme:
+    needs: helm
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Install dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y jq
+
+      - name: Compare README.md
+        id: compare_readme
+        run: |
+          cd ./helm/higress
+          
+          BASE_BRANCH=${GITHUB_BASE_REF:-main} 
+          git fetch origin $BASE_BRANCH
+          
+          if git diff --quiet origin/$BASE_BRANCH -- README.md; then
+            echo "README.md has no local changes compared to $BASE_BRANCH. Skipping translation."
+            echo "skip_translation=true" >> $GITHUB_ENV
+          else
+            echo "README.md has local changes compared to $BASE_BRANCH. Proceeding with translation."
+            echo "skip_translation=false" >> $GITHUB_ENV
+            echo "--------- diff ---------"
+            git diff origin/$BASE_BRANCH -- README.md
+            echo "------------------------"
+          fi
+
+      - name: Translate README.md to Chinese
+        if: env.skip_translation == 'false'
+        env:
+          API_URL: ${{ secrets.HIGRESS_OPENAI_API_URL }}
+          API_KEY: ${{ secrets.HIGRESS_OPENAI_API_KEY }}
+          API_MODEL: ${{ secrets.HIGRESS_OPENAI_API_MODEL }}
+        run: |
+          cat << 'EOF' > translate_readme.py
+          import os
+          import json
+          import requests
+
+          API_URL = os.environ["API_URL"]
+          API_KEY = os.environ["API_KEY"]
+          API_MODEL = os.environ["API_MODEL"]
+          README_PATH = "./helm/higress/README.md"
+          OUTPUT_PATH = "./helm/higress/README.zh.md"
+
+          def stream_translation(api_url, api_key, payload):
+              headers = {
+                  "Content-Type": "application/json",
+                  "Authorization": f"Bearer {api_key}",
+              }
+              response = requests.post(api_url, headers=headers, json=payload, stream=True)
+              response.raise_for_status()
+
+              with open(OUTPUT_PATH, "w", encoding="utf-8") as out_file:
+                  for line in response.iter_lines(decode_unicode=True):
+                      if line.strip() == "" or not line.startswith("data: "):
+                          continue
+                      data = line[6:]
+                      if data.strip() == "[DONE]":
+                          break
+                      try:
+                          chunk = json.loads(data)
+                          content = chunk["choices"][0]["delta"].get("content", "")
+                          if content:
+                              out_file.write(content)
+                      except Exception as e:
+                          print("Error parsing chunk:", e)
+
+          def main():
+              if not os.path.exists(README_PATH):
+                  print("README.md not found!")
+                  return
+
+              with open(README_PATH, "r", encoding="utf-8") as f:
+                  content = f.read()
+
+              payload = {
+                  "model": API_MODEL,
+                  "messages": [
+                      {
+                          "role": "system",
+                          "content": "You are a translation assistant that translates English Markdown text to Chinese. Preserve original Markdown formatting and line breaks."
+                      },
+                      {
+                          "role": "user",
+                          "content": content
+                      }
+                  ],
+                  "temperature": 0.3,
+                  "stream": True
+              }
+
+              print("Streaming translation started...")
+              stream_translation(API_URL, API_KEY, payload)
+              print(f"Translation completed and saved to {OUTPUT_PATH}.")
+
+          if __name__ == "__main__":
+              main()
+          EOF
+          
+          python3 translate_readme.py
+          rm -rf translate_readme.py
+
+      - name: Create Pull Request
+        if: env.skip_translation == 'false'
+        uses: peter-evans/create-pull-request@v7
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          commit-message: "Update helm translated README.zh.md"
+          branch: update-helm-readme-zh
+          title: "Update helm translated README.zh.md"
+          body: |
+            This PR updates the translated README.zh.md file.
+
+            - Automatically generated by GitHub Actions
+          labels: translation, automated
+          base: main
--- a/.github/workflows/release-crd.yaml
+++ b/.github/workflows/release-crd.yaml
@@ -17,7 +17,7 @@ jobs:
        cat helm/core/crds/customresourcedefinitions.gen.yaml helm/core/crds/istio-envoyfilter.yaml > crd.yaml

    - name: Upload hgctl packages to the GitHub release
-      uses: softprops/action-gh-release@da05d552573ad5aba039eaac05058a918a7bf631
+      uses: softprops/action-gh-release@v2
      if: startsWith(github.ref, 'refs/tags/')
      with:
        files: |
--- a/.github/workflows/release-hgctl.yaml
+++ b/.github/workflows/release-hgctl.yaml
@@ -26,7 +26,7 @@ jobs:
        zip -q -r hgctl_${{ env.HGCTL_VERSION }}_windows_arm64.zip out/windows_arm64/

    - name: Upload hgctl packages to the GitHub release
-      uses: softprops/action-gh-release@da05d552573ad5aba039eaac05058a918a7bf631
+      uses: softprops/action-gh-release@v2
      if: startsWith(github.ref, 'refs/tags/')
      with:
        files: |
@@ -51,7 +51,7 @@ jobs:
        tar -zcvf hgctl_${{ env.HGCTL_VERSION }}_darwin_arm64.tar.gz out/darwin_arm64/

    - name: Upload hgctl packages to the GitHub release
-      uses: softprops/action-gh-release@da05d552573ad5aba039eaac05058a918a7bf631
+      uses: softprops/action-gh-release@v2
      if: startsWith(github.ref, 'refs/tags/')
      with:
        files: |
@@ -73,7 +73,7 @@ jobs:
        tar -zcvf hgctl_${{ env.HGCTL_VERSION }}_darwin_amd64.tar.gz out/darwin_amd64/

    - name: Upload hgctl packages to the GitHub release
-      uses: softprops/action-gh-release@da05d552573ad5aba039eaac05058a918a7bf631
+      uses: softprops/action-gh-release@v2
      if: startsWith(github.ref, 'refs/tags/')
      with:
        files: |
--- a/.github/workflows/sync-crds.yaml
+++ b/.github/workflows/sync-crds.yaml
@@ -1,36 +0,0 @@
-name: "Sync CRDs to Helm Chart"
-
-on:
-  workflow_dispatch: ~
-  push:
-    branches: [ main ]
-    paths:
-      - 'api/kubernetes/customresourcedefinitions.gen.yaml'
-
-jobs:
-  sync-crds:
-    name: Sync CRDs
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 1
-
-      - name: Copy the CRD YAML File to Helm Folder
-        run: |
-          cp api/kubernetes/customresourcedefinitions.gen.yaml helm/core/crds/customresourcedefinitions.gen.yaml
-
-      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v7
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          commit-message: "Update CRD file in the helm folder"
-          branch: sync-crds
-          title: "Update CRD file in the helm folder"
-          body: |
-            This PR updates CRD file in the helm folder.
-
-            - Automatically copied by GitHub Actions
-          labels: crds, automated
-          base: main
--- a/.github/workflows/translate-readme.yaml
+++ b/.github/workflows/translate-readme.yaml
@@ -1,131 +0,0 @@
-name: "Helm Docs"
-
-on:
-  workflow_dispatch: ~
-  push:
-    branches: [ main ]
-    paths:
-      - 'helm/higress/README.md'
-
-jobs:
-  translate-readme:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Install dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y jq
-
-      - name: Compare README.md
-        id: compare_readme
-        run: |
-          cd ./helm/higress
-          
-          BASE_BRANCH=${GITHUB_BASE_REF:-main} 
-          git fetch origin $BASE_BRANCH
-          
-          if git diff --quiet origin/$BASE_BRANCH -- README.md; then
-            echo "README.md has no local changes compared to $BASE_BRANCH. Skipping translation."
-            echo "skip_translation=true" >> $GITHUB_ENV
-          else
-            echo "README.md has local changes compared to $BASE_BRANCH. Proceeding with translation."
-            echo "skip_translation=false" >> $GITHUB_ENV
-            echo "--------- diff ---------"
-            git diff origin/$BASE_BRANCH -- README.md
-            echo "------------------------"
-          fi
-
-      - name: Translate README.md to Chinese
-        if: env.skip_translation == 'false'
-        env:
-          API_URL: ${{ secrets.HIGRESS_OPENAI_API_URL }}
-          API_KEY: ${{ secrets.HIGRESS_OPENAI_API_KEY }}
-          API_MODEL: ${{ secrets.HIGRESS_OPENAI_API_MODEL }}
-        run: |
-          cat << 'EOF' > translate_readme.py
-          import os
-          import json
-          import requests
-
-          API_URL = os.environ["API_URL"]
-          API_KEY = os.environ["API_KEY"]
-          API_MODEL = os.environ["API_MODEL"]
-          README_PATH = "./helm/higress/README.md"
-          OUTPUT_PATH = "./helm/higress/README.zh.md"
-
-          def stream_translation(api_url, api_key, payload):
-              headers = {
-                  "Content-Type": "application/json",
-                  "Authorization": f"Bearer {api_key}",
-              }
-              response = requests.post(api_url, headers=headers, json=payload, stream=True)
-              response.raise_for_status()
-
-              with open(OUTPUT_PATH, "w", encoding="utf-8") as out_file:
-                  for line in response.iter_lines(decode_unicode=True):
-                      if line.strip() == "" or not line.startswith("data: "):
-                          continue
-                      data = line[6:]
-                      if data.strip() == "[DONE]":
-                          break
-                      try:
-                          chunk = json.loads(data)
-                          content = chunk["choices"][0]["delta"].get("content", "")
-                          if content:
-                              out_file.write(content)
-                      except Exception as e:
-                          print("Error parsing chunk:", e)
-
-          def main():
-              if not os.path.exists(README_PATH):
-                  print("README.md not found!")
-                  return
-
-              with open(README_PATH, "r", encoding="utf-8") as f:
-                  content = f.read()
-
-              payload = {
-                  "model": API_MODEL,
-                  "messages": [
-                      {
-                          "role": "system",
-                          "content": "You are a translation assistant that translates English Markdown text to Chinese. Preserve original Markdown formatting and line breaks."
-                      },
-                      {
-                          "role": "user",
-                          "content": content
-                      }
-                  ],
-                  "temperature": 0.3,
-                  "stream": True
-              }
-
-              print("Streaming translation started...")
-              stream_translation(API_URL, API_KEY, payload)
-              print(f"Translation completed and saved to {OUTPUT_PATH}.")
-
-          if __name__ == "__main__":
-              main()
-          EOF
-          
-          python3 translate_readme.py
-          rm -rf translate_readme.py
-
-      - name: Create Pull Request
-        if: env.skip_translation == 'false'
-        uses: peter-evans/create-pull-request@v7
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          commit-message: "Update helm translated README.zh.md"
-          branch: update-helm-readme-zh
-          title: "Update helm translated README.zh.md"
-          body: |
-            This PR updates the translated README.zh.md file.
-
-            - Automatically generated by GitHub Actions
-          labels: translation, automated
-          base: main
--- a/.github/workflows/wasm-plugin-unit-test.yml
+++ b/.github/workflows/wasm-plugin-unit-test.yml
@@ -1,378 +0,0 @@
-name: Wasm Plugin Unit Tests(GO)
-
-on:
-  push:
-    branches: [ main ]
-    paths:
-      - 'plugins/wasm-go/extensions/**'
-      - '.github/workflows/wasm-plugin-unit-test.yml'
-      - 'go.mod'
-      - 'go.sum'
-  pull_request:
-    branches: [ "*" ]
-    paths:
-      - 'plugins/wasm-go/extensions/**'
-      - '.github/workflows/wasm-plugin-unit-test.yml'
-      - 'go.mod'
-      - 'go.sum'
-
-env:
-  GO111MODULE: on
-  CGO_ENABLED: 0
-  GOOS: linux
-  GOARCH: amd64
-
-jobs:
-  detect-changed-plugins:
-    name: Detect Changed Plugins
-    runs-on: ubuntu-latest
-    outputs:
-      changed-plugins: ${{ steps.detect.outputs.plugins }}
-      has-changes: ${{ steps.detect.outputs.has-changes }}
-    
-    steps:
-    - name: Checkout code
-      uses: actions/checkout@v4
-      with:
-        fetch-depth: 0  # 获取完整历史用于比较
-        
-    - name: Detect changed plugins
-      id: detect
-      run: |
-        # 获取变更的文件列表
-        if [ "${{ github.event_name }}" = "pull_request" ]; then
-          # PR模式：比较目标分支和源分支
-          git fetch origin ${{ github.base_ref }}
-          CHANGED_FILES=$(git diff --name-only origin/${{ github.base_ref }}...HEAD)
-        else
-          # Push模式：比较当前提交和上一个提交
-          CHANGED_FILES=$(git diff --name-only HEAD~1 HEAD)
-        fi
-        
-        echo "Changed files:"
-        echo "$CHANGED_FILES"
-        
-        # 提取变更的插件名称
-        CHANGED_PLUGINS=""
-        for file in $CHANGED_FILES; do
-          if [[ $file =~ ^plugins/wasm-go/extensions/([^/]+)/ ]]; then
-            PLUGIN_NAME="${BASH_REMATCH[1]}"
-            if [[ ! " $CHANGED_PLUGINS " =~ " $PLUGIN_NAME " ]]; then
-              # 修复：只在非空时添加空格
-              if [ -z "$CHANGED_PLUGINS" ]; then
-                CHANGED_PLUGINS="$PLUGIN_NAME"
-              else
-                CHANGED_PLUGINS="$CHANGED_PLUGINS $PLUGIN_NAME"
-              fi
-            fi
-          fi
-        done
-        
-        # 如果没有插件变更，不触发测试
-        if [ -z "$CHANGED_PLUGINS" ]; then
-          echo "No plugin changes detected, skipping tests"
-          echo "has-changes=false" >> $GITHUB_OUTPUT
-          echo "plugins=[]" >> $GITHUB_OUTPUT
-        else
-          echo "Changed plugins: $CHANGED_PLUGINS"
-          echo "has-changes=true" >> $GITHUB_OUTPUT
-          # 将空格分隔转换为 JSON 数组格式
-          PLUGINS_JSON=$(echo "$CHANGED_PLUGINS" | sed 's/ /","/g' | sed 's/^/["/' | sed 's/$/"]/')
-          echo "PLUGINS_JSON: $PLUGINS_JSON"
-          echo "plugins=$PLUGINS_JSON" >> $GITHUB_OUTPUT
-        fi
-
-  test:
-    name: Test Changed Plugins
-    runs-on: ubuntu-latest
-    needs: detect-changed-plugins
-    if: needs.detect-changed-plugins.outputs.has-changes == 'true'
-    strategy:
-      fail-fast: false
-      matrix:
-        plugin: ${{ fromJSON(needs.detect-changed-plugins.outputs.changed-plugins) }}
-      
-    
-    steps:
-    - name: Checkout code
-      uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
-      
-    - name: Set up Go 1.24
-      uses: actions/setup-go@v4
-      with:
-        go-version: 1.24
-        cache: true
-        
-    - name: Install test tools
-      run: |
-        go install gotest.tools/gotestsum@latest
-        # 移除gocov工具，直接使用Codecov
-        
-    - name: Build WASM for ${{ matrix.plugin }}
-      working-directory: plugins/wasm-go/extensions/${{ matrix.plugin }}
-      run: |
-        echo "Building WASM for ${{ matrix.plugin }}..."
-        
-        # 检查是否存在main.go文件
-        
-        export GOOS=wasip1
-        export GOARCH=wasm
-        
-        # 构建WASM文件，失败时直接退出
-        if ! go build -buildmode=c-shared -o main.wasm ./; then
-          echo "❌ WASM build failed for ${{ matrix.plugin }}"
-          exit 1
-        fi
-        
-        # 验证WASM文件是否生成
-        if [ ! -f "main.wasm" ]; then
-          echo "❌ WASM file not generated for ${{ matrix.plugin }}"
-          exit 1
-        fi
-        
-        echo "✅ WASM build successful for ${{ matrix.plugin }}"
-
-        
-    - name: Set WASM_PATH environment variable
-      run: |
-        echo "WASM_PATH=$(pwd)/plugins/wasm-go/extensions/${{ matrix.plugin }}/main.wasm" >> $GITHUB_ENV
-        
-    - name: Run tests with coverage for ${{ matrix.plugin }}
-      working-directory: plugins/wasm-go/extensions/${{ matrix.plugin }}
-      run: |
-        # 检查是否存在main_test.go文件
-        if [ -f "main_test.go" ]; then
-          echo "Running tests for ${{ matrix.plugin }}..."
-          
-          # 运行测试并生成覆盖率报告
-          gotestsum --junitfile ../../../../test-results-${{ matrix.plugin }}.xml \
-                   --format standard-verbose \
-                   --jsonfile ../../../../test-output-${{ matrix.plugin }}.json \
-                   -- -coverprofile=coverage-${{ matrix.plugin }}.out -covermode=atomic -coverpkg=./... ./...
-          
-          echo "✅ Tests completed for ${{ matrix.plugin }}"
-        else
-          echo "No tests found for ${{ matrix.plugin }}, skipping..."
-          # 创建空的测试结果文件
-          echo '<?xml version="1.0" encoding="UTF-8"?><testsuites><testsuite name="no-tests" tests="0" failures="0" errors="0" time="0"></testsuite></testsuites>' > ../../../../test-results-${{ matrix.plugin }}.xml
-        fi
-        
-    - name: Upload test results for ${{ matrix.plugin }}
-      uses: actions/upload-artifact@v4
-      if: always()
-      with:
-        name: test-results-${{ matrix.plugin }}
-        path: |
-          test-results-${{ matrix.plugin }}.xml
-          test-output-${{ matrix.plugin }}.json
-        retention-days: 30
-        
-    - name: Upload coverage report for ${{ matrix.plugin }}
-      uses: actions/upload-artifact@v4
-      if: always()
-      with:
-        name: coverage-${{ matrix.plugin }}
-        path: plugins/wasm-go/extensions/${{ matrix.plugin }}/coverage-${{ matrix.plugin }}.out
-        retention-days: 30
-
-  test-summary:
-    name: Test Summary & Coverage
-    runs-on: ubuntu-latest
-    needs: [detect-changed-plugins, test]
-    if: always() && needs.detect-changed-plugins.outputs.has-changes == 'true'
-    
-    steps:
-    - name: Checkout code
-      uses: actions/checkout@v4
-      
-    - name: Set up Go 1.24
-      uses: actions/setup-go@v4
-      with:
-        go-version: 1.24
-        cache: true
-        
-    - name: Install required tools
-      run: |
-        go install github.com/wadey/gocovmerge@latest
-        
-    - name: Download all test results
-      uses: actions/download-artifact@v4
-      with:
-        pattern: test-results-*
-        merge-multiple: true
-        path: ${{ github.workspace }}
-        
-    - name: Download all coverage files
-      uses: actions/download-artifact@v4
-      with:
-        pattern: coverage-*
-        merge-multiple: true
-        path: ${{ github.workspace }}
-        
-
-        
-    - name: Generate comprehensive test summary
-      run: |
-        echo "## 🧪 Go Plugin Test Results" >> $GITHUB_STEP_SUMMARY
-        echo "" >> $GITHUB_STEP_SUMMARY
-        
-        total_plugins=0
-        passed_plugins=0
-        failed_plugins=0
-        total_tests=0
-        total_failures=0
-        total_errors=0
-        
-        echo "### 📊 Test Results by Plugin" >> $GITHUB_STEP_SUMMARY
-        echo "" >> $GITHUB_STEP_SUMMARY
-        
-        for result_file in test-results-*.xml; do
-          if [ -f "$result_file" ]; then
-            plugin_name=$(echo "$result_file" | sed 's/test-results-\(.*\)\.xml/\1/')
-            total_plugins=$((total_plugins + 1))
-            
-            # 解析XML获取测试结果
-            if grep -q '<testsuite' "$result_file"; then
-              # 使用grep解析XML属性，更稳定可靠
-              tests=$(grep -o 'tests="[0-9]*"' "$result_file" | head -1 | grep -o '[0-9]*' || echo "0")
-              failures=$(grep -o 'failures="[0-9]*"' "$result_file" | head -1 | grep -o '[0-9]*' || echo "0")
-              errors=$(grep -o 'errors="[0-9]*"' "$result_file" | head -1 | grep -o '[0-9]*' || echo "0")
-              time=$(grep -o 'time="[0-9.]*"' "$result_file" | head -1 | grep -o '[0-9.]*' || echo "0")
-              
-              # 确保数值有效，避免bash算术运算错误
-              tests=${tests:-0}
-              failures=${failures:-0}
-              errors=${errors:-0}
-              
-              # 转换为整数进行算术运算
-              total_tests=$((total_tests + tests))
-              total_failures=$((total_failures + failures))
-              total_errors=$((total_errors + errors))
-              
-              if [ "$failures" = "0" ] && [ "$errors" = "0" ]; then
-                echo "✅ **$plugin_name**: $tests tests passed in ${time}s" >> $GITHUB_STEP_SUMMARY
-                passed_plugins=$((passed_plugins + 1))
-              else
-                echo "❌ **$plugin_name**: $tests tests, $failures failures, $errors errors in ${time}s" >> $GITHUB_STEP_SUMMARY
-                failed_plugins=$((failed_plugins + 1))
-              fi
-            else
-              echo "⚠️ **$plugin_name**: No tests found" >> $GITHUB_STEP_SUMMARY
-            fi
-          fi
-        done
-        
-        echo "" >> $GITHUB_STEP_SUMMARY
-        echo "### 📈 Coverage Report" >> $GITHUB_STEP_SUMMARY
-        echo "" >> $GITHUB_STEP_SUMMARY
-        echo "📊 **Coverage reports are now available on Codecov**" >> $GITHUB_STEP_SUMMARY
-        echo "🔗 **This Commit Coverage**: https://codecov.io/gh/${{ github.repository }}/commit/${{ github.sha }}" >> $GITHUB_STEP_SUMMARY
-        echo "" >> $GITHUB_STEP_SUMMARY
-        
-        echo "### 🎯 Summary" >> $GITHUB_STEP_SUMMARY
-        echo "- **Total plugins**: $total_plugins" >> $GITHUB_STEP_SUMMARY
-        echo "- **Passed**: $passed_plugins ✅" >> $GITHUB_STEP_SUMMARY
-        echo "- **Failed**: $failed_plugins ❌" >> $GITHUB_STEP_SUMMARY
-        echo "- **Total tests**: $total_tests" >> $GITHUB_STEP_SUMMARY
-        echo "- **Total failures**: $total_failures" >> $GITHUB_STEP_SUMMARY
-        echo "- **Total errors**: $total_errors" >> $GITHUB_STEP_SUMMARY
-        
-        # 如果有失败，显示详细信息
-        if [ $total_failures -gt 0 ] || [ $total_errors -gt 0 ]; then
-          echo "" >> $GITHUB_STEP_SUMMARY
-          echo "### ❌ Failed Tests Details" >> $GITHUB_STEP_SUMMARY
-          echo "" >> $GITHUB_STEP_SUMMARY
-          echo "**Failed plugins**: $failed_plugins" >> $GITHUB_STEP_SUMMARY
-          echo "**Total failures**: $total_failures" >> $GITHUB_STEP_SUMMARY
-          echo "**Total errors**: $total_errors" >> $GITHUB_STEP_SUMMARY
-          echo "" >> $GITHUB_STEP_SUMMARY
-          echo "📋 **View detailed logs**: [Click here](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }})" >> $GITHUB_STEP_SUMMARY
-          echo "" >> $GITHUB_STEP_SUMMARY
-          
-          # 显示每个失败插件的详细信息
-          echo "#### 📊 Failed Plugin Details" >> $GITHUB_STEP_SUMMARY
-          echo "" >> $GITHUB_STEP_SUMMARY
-          
-          for result_file in test-results-*.xml; do
-            if [ -f "$result_file" ]; then
-              plugin_name=$(echo "$result_file" | sed 's/test-results-\(.*\)\.xml/\1/')
-              
-              # 检查是否有失败
-              failures=$(grep -o 'failures="[0-9]*"' "$result_file" | head -1 | grep -o '[0-9]*' || echo "0")
-              errors=$(grep -o 'errors="[0-9]*"' "$result_file" | head -1 | grep -o '[0-9]*' || echo "0")
-              
-              # 确保数值有效
-              failures=${failures:-0}
-              errors=${errors:-0}
-              
-              if [ "$failures" -gt 0 ] || [ "$errors" -gt 0 ]; then
-                echo "**$plugin_name**:" >> $GITHUB_STEP_SUMMARY
-                echo "- Failures: $failures" >> $GITHUB_STEP_SUMMARY
-                echo "- Errors: $errors" >> $GITHUB_STEP_SUMMARY
-                echo "- [View plugin logs](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }})" >> $GITHUB_STEP_SUMMARY
-                echo "" >> $GITHUB_STEP_SUMMARY
-              fi
-            fi
-          done
-        fi
-        
-    # - name: Merge coverage reports
-    #   run: |
-    #     echo "Merging coverage reports..."
-    #     
-    #     # 使用绝对路径查找，更可靠
-    #     coverage_files=$(find ${{ github.workspace }} -name "coverage-*")
-    #     
-    #     if [ -n "$coverage_files" ]; then
-    #       echo "Found coverage files:"
-    #       echo "$coverage_files"
-    #       
-    #       # 使用gocovmerge顺序合并
-    #       echo "Merging Go coverage files using gocovmerge sequential method..."
-    #       
-    #       # 将文件列表转换为数组
-    #       readarray -t coverage_array <<< "$coverage_files"
-    #       file_count=${#coverage_array[@]}
-    #       
-    #       echo "Total files to merge: $file_count"
-    #       
-    #       # 复制第一个文件作为基础
-    #       cp "${coverage_array[0]}" ${{ github.workspace }}/merged_coverage.out
-    #       echo "Starting with: ${coverage_array[0]}"
-    #       
-    #       # 如果有多个文件，逐个合并其他文件到最终目标
-    #       if [ $file_count -gt 1 ]; then
-    #         echo "Multiple files, merging sequentially with gocovmerge..."
-    #         
-    #         for ((i=1; i<file_count; i++)); do
-    #           current_file="${coverage_array[i]}"
-    #           
-    #           echo "Merging file $((i+1))/$file_count: $current_file"
-    #           
-    #           # 使用gocovmerge合并到最终目标文件
-    #           gocovmerge "${{ github.workspace }}/merged_coverage.out" "$current_file" > "${{ github.workspace }}/temp_merge.out"
-    #           mv "${{ github.workspace }}/temp_merge.out" "${{ github.workspace }}/merged_coverage.out"
-    #           
-    #           echo "Successfully merged with $current_file"
-    #           done
-    #         fi
-    #         
-    #         echo "Coverage reports merged successfully using gocovmerge sequential method"
-    #         echo "Merged file size: $(wc -c < ${{ github.workspace }}/merged_coverage.out) bytes"
-    #       else
-    #         echo "No coverage files found"
-    #         # 创建空的覆盖率文件
-    #         echo "mode: atomic" > ${{ github.workspace }}/merged_coverage.out
-    #       fi
-        
-    # - name: Upload merged coverage to Codecov
-    #   uses: codecov/codecov-action@v4
-    #   if: always()
-    #   with:
-    #     file: ${{ github.workspace }}/merged_coverage.out
-    #     flags: wasm-go-plugins-tests
-    #     name: codecov-wasm-go-plugins
-    #     fail_ci_if_error: false
-    #     verbose: true
--- a/.licenserc.yaml
+++ b/.licenserc.yaml
@@ -27,14 +27,12 @@ header:
    - 'plugins/**'
    - 'CODEOWNERS'
    - 'VERSION'
-    - 'DEP_VERSION'
    - 'tools/'
    - 'test/README.md'
    - 'test/README_CN.md'
    - 'hgctl/cmd/hgctl/config/testdata/config'
    - 'hgctl/pkg/manifests'
    - 'pkg/ingress/kube/gateway/istio/testdata'
-    - 'release-notes/**'

  comment: on-failure
 dependency:
--- a/6
+++ b/6
@@ -2,10 +2,10 @@
 /envoy @gengleilei @johnlanni
 /istio @SpecialYang @johnlanni
 /pkg @SpecialYang @johnlanni @CH3CHO
-/plugins @johnlanni @CH3CHO @rinfx @erasernoob
-/plugins/wasm-go/extensions/ai-proxy @rinfx @wydream @johnlanni
+/plugins @johnlanni @CH3CHO @rinfx
+/plugins/wasm-go/extensions/ai-proxy @cr7258 @CH3CHO @rinfx
 /plugins/wasm-rust @007gzs @jizhuozhi
-/registry @Erica177 @2456868764 @johnlanni
+/registry @NameHaibinZhang @2456868764 @johnlanni
 /test @Xunzhuo @2456868764 @CH3CHO
 /tools @johnlanni @Xunzhuo @2456868764

--- a/1
+++ b/1
@@ -1 +0,0 @@
-higress-console: v2.1.8
--- a/Makefile.core.mk
+++ b/Makefile.core.mk
@@ -10,7 +10,7 @@ export BASE_VERSION ?= $(HIGRESS_BASE_VERSION)

 export CHARTS ?= higress-registry.cn-hangzhou.cr.aliyuncs.com/charts

-VERSION_PACKAGE := github.com/alibaba/higress/v2/pkg/cmd/lversion
+VERSION_PACKAGE := github.com/alibaba/higress/pkg/cmd/lversion

 GIT_COMMIT:=$(shell git rev-parse HEAD)

@@ -137,16 +137,14 @@ endif
 # for now docker is limited to Linux compiles - why ?
 include docker/docker.mk

-docker-build-amd64: clean-higress docker.higress-amd64 ## Build and push amdd64 docker images to registry defined by $HUB and $TAG
-
-docker-build: clean-higress docker.higress ## Build and push docker images to registry defined by $HUB and $TAG
+docker-build: docker.higress ## Build and push docker images to registry defined by $HUB and $TAG

 docker-buildx-push: clean-env docker.higress-buildx

 export PARENT_GIT_TAG:=$(shell cat VERSION)
 export PARENT_GIT_REVISION:=$(TAG)

-export ENVOY_PACKAGE_URL_PATTERN?=https://github.com/higress-group/proxy/releases/download/v2.1.9/envoy-symbol-ARCH.tar.gz
+export ENVOY_PACKAGE_URL_PATTERN?=https://github.com/higress-group/proxy/releases/download/v2.1.5/envoy-symbol-ARCH.tar.gz

 build-envoy: prebuild
 	./tools/hack/build-envoy.sh
@@ -193,9 +191,8 @@ install: pre-install
 	cd helm/higress; helm dependency build
 	helm install higress helm/higress -n higress-system --create-namespace --set 'global.local=true'

-HIGRESS_LATEST_IMAGE_TAG ?= latest
-ENVOY_LATEST_IMAGE_TAG ?= 48da465cfd0dc5c9ac851bd2b9743780dc82dd8a
-ISTIO_LATEST_IMAGE_TAG ?= latest
+ENVOY_LATEST_IMAGE_TAG ?= 958467a353d411ae3f06e03b096bfd342cddb2c6
+ISTIO_LATEST_IMAGE_TAG ?= d9c728d3b01f64855e012b08d136e306f1160397

 install-dev: pre-install
 	helm install higress helm/core -n higress-system --create-namespace --set 'controller.tag=$(TAG)' --set 'gateway.replicas=1' --set 'pilot.tag=$(ISTIO_LATEST_IMAGE_TAG)' --set 'gateway.tag=$(ENVOY_LATEST_IMAGE_TAG)' --set 'global.local=true'
@@ -271,26 +268,10 @@ higress-conformance-test-clean: $(tools/kind) delete-cluster
 .PHONY: higress-wasmplugin-test-prepare
 higress-wasmplugin-test-prepare: $(tools/kind) delete-cluster create-cluster docker-build kube-load-image install-dev-wasmplugin

-# higress-wasmplugin-test-prepare-skip-docker-build prepares the environment for higress wasmplugin tests without build higress docker image.
-.PHONY: higress-wasmplugin-test-prepare-skip-docker-build
-higress-wasmplugin-test-prepare-skip-docker-build: $(tools/kind) delete-cluster create-cluster prebuild
-	@export TAG="$(HIGRESS_LATEST_IMAGE_TAG)" && \
-	$(MAKE) kube-load-image && \
-	$(MAKE) install-dev-wasmplugin
-
 # higress-wasmplugin-test runs ingress wasmplugin tests.
 .PHONY: higress-wasmplugin-test
 higress-wasmplugin-test: $(tools/kind) delete-cluster create-cluster docker-build kube-load-image install-dev-wasmplugin run-higress-e2e-test-wasmplugin delete-cluster

-# higress-wasmplugin-test-skip-docker-build runs ingress wasmplugin tests without build higress docker image
-.PHONY: higress-wasmplugin-test-skip-docker-build
-higress-wasmplugin-test-skip-docker-build: $(tools/kind) delete-cluster create-cluster prebuild
-	@export TAG="$(HIGRESS_LATEST_IMAGE_TAG)" && \
-	$(MAKE) kube-load-image && \
-	$(MAKE) install-dev-wasmplugin && \
-	$(MAKE) run-higress-e2e-test-wasmplugin && \
-	$(MAKE) delete-cluster
-
 # higress-wasmplugin-test-clean cleans the environment for higress wasmplugin tests.
 .PHONY: higress-wasmplugin-test-clean
 higress-wasmplugin-test-clean: $(tools/kind) delete-cluster
@@ -309,12 +290,8 @@ delete-cluster: $(tools/kind) ## Delete kind cluster.
 # dubbo-provider-demo和nacos-standlone-rc3的镜像已经上传到阿里云镜像库，第一次需要先拉到本地
 # docker pull registry.cn-hangzhou.aliyuncs.com/hinsteny/dubbo-provider-demo:0.0.1
 # docker pull registry.cn-hangzhou.aliyuncs.com/hinsteny/nacos-standlone-rc3:1.0.0-RC3
-# If TAG is HIGRESS_LATEST_IMAGE_TAG, means we skip building higress docker image, so we need to pull the image first.
 .PHONY: kube-load-image
 kube-load-image: $(tools/kind) ## Install the Higress image to a kind cluster using the provided $IMAGE and $TAG.
-	@if [ "$(TAG)" = "$(HIGRESS_LATEST_IMAGE_TAG)" ]; then \
-		tools/hack/docker-pull-image.sh higress-registry.cn-hangzhou.cr.aliyuncs.com/higress/higress $(TAG); \
-	fi
 	tools/hack/kind-load-image.sh higress-registry.cn-hangzhou.cr.aliyuncs.com/higress/higress $(TAG)
 	tools/hack/docker-pull-image.sh higress-registry.cn-hangzhou.cr.aliyuncs.com/higress/pilot $(ISTIO_LATEST_IMAGE_TAG)
 	tools/hack/docker-pull-image.sh higress-registry.cn-hangzhou.cr.aliyuncs.com/higress/gateway $(ENVOY_LATEST_IMAGE_TAG)
--- a/README.md
+++ b/README.md
@@ -10,24 +10,21 @@
    
 [![Build Status](https://github.com/alibaba/higress/actions/workflows/build-and-test.yaml/badge.svg?branch=main)](https://github.com/alibaba/higress/actions)
 [![license](https://img.shields.io/github/license/alibaba/higress.svg)](https://www.apache.org/licenses/LICENSE-2.0.html)
-[![discord](https://img.shields.io/discord/1364956090566971515?color=5865F2&label=discord&labelColor=black&logo=discord&logoColor=white&style=flat-square)](https://discord.gg/tSbww9VDaM)
+[![discord](https://img.shields.io/discord/1364956090566971515?color=5865F2&label=discord&labelColor=black&logo=discord&logoColor=white&style=flat-square)](https://discord.gg/reymxYM5)

 <a href="https://trendshift.io/repositories/10918" target="_blank"><img src="https://trendshift.io/api/badge/repositories/10918" alt="alibaba%2Fhigress | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a> <a href="https://www.producthunt.com/posts/higress?embed=true&utm_source=badge-featured&utm_medium=badge&utm_souce=badge-higress" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/featured.svg?post_id=951287&theme=light&t=1745492822283" alt="Higress - Global&#0032;APIs&#0032;as&#0032;MCP&#0032;powered&#0032;by&#0032;AI&#0032;Gateway | Product Hunt" style="width: 250px; height: 54px;" width="250" height="54" /></a>

 </div>

 [**Official Site**](https://higress.ai/en/) &nbsp; |
-&nbsp; [**Docs**](https://higress.cn/en/docs/latest/overview/what-is-higress/) &nbsp; |
-&nbsp; [**Blog**](https://higress.cn/en/blog/) &nbsp; |
 &nbsp; [**MCP Server QuickStart**](https://higress.cn/en/ai/mcp-quick-start/) &nbsp; |
-&nbsp; [**Developer Guide**](https://higress.cn/en/docs/latest/dev/architecture/) &nbsp; |
 &nbsp; [**Wasm Plugin Hub**](https://higress.cn/en/plugin/) &nbsp; |

 <p>
-   English | <a href="README_ZH.md">中文</a> | <a href="README_JP.md">日本語</a>
+   English | <a href="README_ZH.md">中文<a/> | <a href="README_JP.md">日本語<a/>
 </p>

-## What is Higress?
+## Test What is Higress?

 Higress is a cloud-native API gateway based on Istio and Envoy, which can be extended with Wasm plugins written in Go/Rust/JS. It provides dozens of ready-to-use general-purpose plugins and an out-of-the-box console (try the [demo here](http://demo.higress.io/)).

@@ -72,10 +69,6 @@ Port descriptions:

 > All Higress Docker images use Higress's own image repository and are not affected by Docker Hub rate limits.
 > In addition, the submission and updates of the images are protected by a security scanning mechanism (powered by Alibaba Cloud ACR), making them very secure for use in production environments.
-> 
-> If you experience a timeout when pulling image from `higress-registry.cn-hangzhou.cr.aliyuncs.com`, you can try replacing it with the following docker registry mirror source:
-> 
-> **Southeast Asia**: `higress-registry.ap-southeast-7.cr.aliyuncs.com`

 For other installation methods such as Helm deployment under K8s, please refer to the official [Quick Start documentation](https://higress.io/en-us/docs/user/quickstart).

@@ -150,7 +143,7 @@ For other installation methods such as Helm deployment under K8s, please refer t

 Join our Discord community! This is where you can connect with developers and other enthusiastic users of Higress.

-[![discord](https://img.shields.io/discord/1364956090566971515?color=5865F2&label=discord&labelColor=black&logo=discord&logoColor=white&style=for-the-badge)](https://discord.gg/tSbww9VDaM)
+[![discord](https://img.shields.io/discord/1364956090566971515?color=5865F2&label=discord&labelColor=black&logo=discord&logoColor=white&style=for-the-badge)](https://discord.gg/reymxYM5)


 ### Thanks
--- a/README_JP.md
+++ b/README_JP.md
@@ -18,7 +18,7 @@


 <p>
-   <a href="README.md"> English </a> | <a href="README_ZH.md">中文</a> | 日本語
+   <a href="README_EN.md"> English <a/> | <a href="README.md">中文<a/> | 日本語
 </p>


--- a/README_ZH.md
+++ b/README_ZH.md
@@ -24,7 +24,7 @@


 <p>
-   <a href="README.md"> English </a>| 中文 | <a href="README_JP.md"> 日本語 </a> 
+   <a href="README.md"> English <a/>| 中文 | <a href="README_JP.md"> 日本語 <a/> 
 </p>


--- a/2
+++ b/2
@@ -1 +1 @@
-v2.1.9-rc.1
+v2.1.3
--- a/api/cue.yaml
+++ b/api/cue.yaml
@@ -1,6 +1,6 @@
 # Cuelang configuration to generate OpenAPI schema for Higress configs.

-module: github.com/alibaba/higress/v2/api
+module: github.com/alibaba/higress/api

 openapi:
  selfContained: true
--- a/api/extensions/v1alpha1/wasmplugin.proto
+++ b/api/extensions/v1alpha1/wasmplugin.proto
@@ -24,7 +24,7 @@ import "google/protobuf/struct.proto";

 package higress.extensions.v1alpha1;

-option go_package="github.com/alibaba/higress/v2/api/extensions/v1alpha1";
+option go_package="github.com/alibaba/higress/api/extensions/v1alpha1";

 // <!-- crd generation tags
 // +cue-gen:WasmPlugin:groupName:extensions.higress.io
--- a/api/gen.sh
+++ b/api/gen.sh
@@ -7,5 +7,5 @@ buf generate \
    --path networking \
    --path extensions

-# Generate CRDs
+# Generate CRDs 
 cue-gen -verbose -f=./cue.yaml -crd=true
--- a/api/kubernetes/customresourcedefinitions.gen.yaml
+++ b/api/kubernetes/customresourcedefinitions.gen.yaml
@@ -247,30 +247,9 @@ spec:
        properties:
          spec:
            properties:
-              proxies:
-                items:
-                  properties:
-                    connectTimeout:
-                      type: integer
-                    listenerPort:
-                      type: integer
-                    name:
-                      type: string
-                    serverAddress:
-                      type: string
-                    serverPort:
-                      type: integer
-                    type:
-                      type: string
-                  type: object
-                type: array
              registries:
                items:
                  properties:
-                    allowMcpServers:
-                      items:
-                        type: string
-                      type: array
                    authSecretName:
                      type: string
                    consulDatacenter:
@@ -286,23 +265,12 @@ spec:
                      type: string
                    enableMCPServer:
                      type: boolean
-                    enableScopeMcpServers:
-                      type: boolean
                    mcpServerBaseUrl:
                      type: string
                    mcpServerExportDomains:
                      items:
                        type: string
                      type: array
-                    metadata:
-                      additionalProperties:
-                        properties:
-                          innerMap:
-                            additionalProperties:
-                              type: string
-                            type: object
-                        type: object
-                      type: object
                    nacosAccessKey:
                      type: string
                    nacosAddressServer:
@@ -326,26 +294,10 @@ spec:
                      type: integer
                    protocol:
                      type: string
-                    proxyName:
-                      type: string
                    sni:
                      type: string
                    type:
                      type: string
-                    vport:
-                      properties:
-                        default:
-                          type: integer
-                        services:
-                          items:
-                            properties:
-                              name:
-                                type: string
-                              value:
-                                type: integer
-                            type: object
-                          type: array
-                      type: object
                    zkServicesPath:
                      items:
                        type: string
--- a/api/networking/v1/http_2_rpc.proto
+++ b/api/networking/v1/http_2_rpc.proto
@@ -1,11 +1,11 @@
 // Copyright (c) 2022 Alibaba Group Holding Ltd.
-//
+//  
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
-//
+//  
 //      http://www.apache.org/licenses/LICENSE-2.0
-//
+//  
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -23,7 +23,7 @@ import "google/api/field_behavior.proto";

 package higress.networking.v1;

-option go_package = "github.com/alibaba/higress/v2/api/networking/v1";
+option go_package = "github.com/alibaba/higress/api/networking/v1";

 // <!-- crd generation tags
 // +cue-gen:Http2Rpc:groupName:networking.higress.io
--- a/api/networking/v1/mcp_bridge.pb.go
+++ b/api/networking/v1/mcp_bridge.pb.go
@@ -65,7 +65,6 @@ type McpBridge struct {
 	unknownFields protoimpl.UnknownFields

 	Registries []*RegistryConfig `protobuf:"bytes,1,rep,name=registries,proto3" json:"registries,omitempty"`
-	Proxies    []*ProxyConfig    `protobuf:"bytes,2,rep,name=proxies,proto3" json:"proxies,omitempty"`
 }

 func (x *McpBridge) Reset() {
@@ -107,45 +106,33 @@ func (x *McpBridge) GetRegistries() []*RegistryConfig {
 	return nil
 }

-func (x *McpBridge) GetProxies() []*ProxyConfig {
-	if x != nil {
-		return x.Proxies
-	}
-	return nil
-}
-
 type RegistryConfig struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields

-	Type                   string                `protobuf:"bytes,1,opt,name=type,proto3" json:"type,omitempty"`
-	Name                   string                `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
-	Domain                 string                `protobuf:"bytes,3,opt,name=domain,proto3" json:"domain,omitempty"`
-	Port                   uint32                `protobuf:"varint,4,opt,name=port,proto3" json:"port,omitempty"`
-	NacosAddressServer     string                `protobuf:"bytes,5,opt,name=nacosAddressServer,proto3" json:"nacosAddressServer,omitempty"`
-	NacosAccessKey         string                `protobuf:"bytes,6,opt,name=nacosAccessKey,proto3" json:"nacosAccessKey,omitempty"`
-	NacosSecretKey         string                `protobuf:"bytes,7,opt,name=nacosSecretKey,proto3" json:"nacosSecretKey,omitempty"`
-	NacosNamespaceId       string                `protobuf:"bytes,8,opt,name=nacosNamespaceId,proto3" json:"nacosNamespaceId,omitempty"`
-	NacosNamespace         string                `protobuf:"bytes,9,opt,name=nacosNamespace,proto3" json:"nacosNamespace,omitempty"`
-	NacosGroups            []string              `protobuf:"bytes,10,rep,name=nacosGroups,proto3" json:"nacosGroups,omitempty"`
-	NacosRefreshInterval   int64                 `protobuf:"varint,11,opt,name=nacosRefreshInterval,proto3" json:"nacosRefreshInterval,omitempty"`
-	ConsulNamespace        string                `protobuf:"bytes,12,opt,name=consulNamespace,proto3" json:"consulNamespace,omitempty"`
-	ZkServicesPath         []string              `protobuf:"bytes,13,rep,name=zkServicesPath,proto3" json:"zkServicesPath,omitempty"`
-	ConsulDatacenter       string                `protobuf:"bytes,14,opt,name=consulDatacenter,proto3" json:"consulDatacenter,omitempty"`
-	ConsulServiceTag       string                `protobuf:"bytes,15,opt,name=consulServiceTag,proto3" json:"consulServiceTag,omitempty"`
-	ConsulRefreshInterval  int64                 `protobuf:"varint,16,opt,name=consulRefreshInterval,proto3" json:"consulRefreshInterval,omitempty"`
-	AuthSecretName         string                `protobuf:"bytes,17,opt,name=authSecretName,proto3" json:"authSecretName,omitempty"`
-	Protocol               string                `protobuf:"bytes,18,opt,name=protocol,proto3" json:"protocol,omitempty"`
-	Sni                    string                `protobuf:"bytes,19,opt,name=sni,proto3" json:"sni,omitempty"`
-	McpServerExportDomains []string              `protobuf:"bytes,20,rep,name=mcpServerExportDomains,proto3" json:"mcpServerExportDomains,omitempty"`
-	McpServerBaseUrl       string                `protobuf:"bytes,21,opt,name=mcpServerBaseUrl,proto3" json:"mcpServerBaseUrl,omitempty"`
-	EnableMCPServer        *wrappers.BoolValue   `protobuf:"bytes,22,opt,name=enableMCPServer,proto3" json:"enableMCPServer,omitempty"`
-	EnableScopeMcpServers  *wrappers.BoolValue   `protobuf:"bytes,23,opt,name=enableScopeMcpServers,proto3" json:"enableScopeMcpServers,omitempty"`
-	AllowMcpServers        []string              `protobuf:"bytes,24,rep,name=allowMcpServers,proto3" json:"allowMcpServers,omitempty"`
-	Metadata               map[string]*InnerMap  `protobuf:"bytes,25,rep,name=metadata,proto3" json:"metadata,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	ProxyName              string                `protobuf:"bytes,26,opt,name=proxyName,proto3" json:"proxyName,omitempty"`
-	Vport                  *RegistryConfig_VPort `protobuf:"bytes,27,opt,name=vport,proto3" json:"vport,omitempty"`
+	Type                   string              `protobuf:"bytes,1,opt,name=type,proto3" json:"type,omitempty"`
+	Name                   string              `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
+	Domain                 string              `protobuf:"bytes,3,opt,name=domain,proto3" json:"domain,omitempty"`
+	Port                   uint32              `protobuf:"varint,4,opt,name=port,proto3" json:"port,omitempty"`
+	NacosAddressServer     string              `protobuf:"bytes,5,opt,name=nacosAddressServer,proto3" json:"nacosAddressServer,omitempty"`
+	NacosAccessKey         string              `protobuf:"bytes,6,opt,name=nacosAccessKey,proto3" json:"nacosAccessKey,omitempty"`
+	NacosSecretKey         string              `protobuf:"bytes,7,opt,name=nacosSecretKey,proto3" json:"nacosSecretKey,omitempty"`
+	NacosNamespaceId       string              `protobuf:"bytes,8,opt,name=nacosNamespaceId,proto3" json:"nacosNamespaceId,omitempty"`
+	NacosNamespace         string              `protobuf:"bytes,9,opt,name=nacosNamespace,proto3" json:"nacosNamespace,omitempty"`
+	NacosGroups            []string            `protobuf:"bytes,10,rep,name=nacosGroups,proto3" json:"nacosGroups,omitempty"`
+	NacosRefreshInterval   int64               `protobuf:"varint,11,opt,name=nacosRefreshInterval,proto3" json:"nacosRefreshInterval,omitempty"`
+	ConsulNamespace        string              `protobuf:"bytes,12,opt,name=consulNamespace,proto3" json:"consulNamespace,omitempty"`
+	ZkServicesPath         []string            `protobuf:"bytes,13,rep,name=zkServicesPath,proto3" json:"zkServicesPath,omitempty"`
+	ConsulDatacenter       string              `protobuf:"bytes,14,opt,name=consulDatacenter,proto3" json:"consulDatacenter,omitempty"`
+	ConsulServiceTag       string              `protobuf:"bytes,15,opt,name=consulServiceTag,proto3" json:"consulServiceTag,omitempty"`
+	ConsulRefreshInterval  int64               `protobuf:"varint,16,opt,name=consulRefreshInterval,proto3" json:"consulRefreshInterval,omitempty"`
+	AuthSecretName         string              `protobuf:"bytes,17,opt,name=authSecretName,proto3" json:"authSecretName,omitempty"`
+	Protocol               string              `protobuf:"bytes,18,opt,name=protocol,proto3" json:"protocol,omitempty"`
+	Sni                    string              `protobuf:"bytes,19,opt,name=sni,proto3" json:"sni,omitempty"`
+	McpServerExportDomains []string            `protobuf:"bytes,20,rep,name=mcpServerExportDomains,proto3" json:"mcpServerExportDomains,omitempty"`
+	McpServerBaseUrl       string              `protobuf:"bytes,21,opt,name=mcpServerBaseUrl,proto3" json:"mcpServerBaseUrl,omitempty"`
+	EnableMCPServer        *wrappers.BoolValue `protobuf:"bytes,22,opt,name=enableMCPServer,proto3" json:"enableMCPServer,omitempty"`
 }

 func (x *RegistryConfig) Reset() {
@@ -334,285 +321,6 @@ func (x *RegistryConfig) GetEnableMCPServer() *wrappers.BoolValue {
 	return nil
 }

-func (x *RegistryConfig) GetEnableScopeMcpServers() *wrappers.BoolValue {
-	if x != nil {
-		return x.EnableScopeMcpServers
-	}
-	return nil
-}
-
-func (x *RegistryConfig) GetAllowMcpServers() []string {
-	if x != nil {
-		return x.AllowMcpServers
-	}
-	return nil
-}
-
-func (x *RegistryConfig) GetMetadata() map[string]*InnerMap {
-	if x != nil {
-		return x.Metadata
-	}
-	return nil
-}
-
-func (x *RegistryConfig) GetProxyName() string {
-	if x != nil {
-		return x.ProxyName
-	}
-	return ""
-}
-
-func (x *RegistryConfig) GetVport() *RegistryConfig_VPort {
-	if x != nil {
-		return x.Vport
-	}
-	return nil
-}
-
-type ProxyConfig struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Type           string `protobuf:"bytes,1,opt,name=type,proto3" json:"type,omitempty"`
-	Name           string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
-	ServerAddress  string `protobuf:"bytes,3,opt,name=serverAddress,proto3" json:"serverAddress,omitempty"`
-	ServerPort     uint32 `protobuf:"varint,4,opt,name=serverPort,proto3" json:"serverPort,omitempty"`
-	ListenerPort   uint32 `protobuf:"varint,5,opt,name=listenerPort,proto3" json:"listenerPort,omitempty"`
-	ConnectTimeout uint32 `protobuf:"varint,6,opt,name=connectTimeout,proto3" json:"connectTimeout,omitempty"`
-}
-
-func (x *ProxyConfig) Reset() {
-	*x = ProxyConfig{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_networking_v1_mcp_bridge_proto_msgTypes[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ProxyConfig) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ProxyConfig) ProtoMessage() {}
-
-func (x *ProxyConfig) ProtoReflect() protoreflect.Message {
-	mi := &file_networking_v1_mcp_bridge_proto_msgTypes[2]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ProxyConfig.ProtoReflect.Descriptor instead.
-func (*ProxyConfig) Descriptor() ([]byte, []int) {
-	return file_networking_v1_mcp_bridge_proto_rawDescGZIP(), []int{2}
-}
-
-func (x *ProxyConfig) GetType() string {
-	if x != nil {
-		return x.Type
-	}
-	return ""
-}
-
-func (x *ProxyConfig) GetName() string {
-	if x != nil {
-		return x.Name
-	}
-	return ""
-}
-
-func (x *ProxyConfig) GetServerAddress() string {
-	if x != nil {
-		return x.ServerAddress
-	}
-	return ""
-}
-
-func (x *ProxyConfig) GetServerPort() uint32 {
-	if x != nil {
-		return x.ServerPort
-	}
-	return 0
-}
-
-func (x *ProxyConfig) GetListenerPort() uint32 {
-	if x != nil {
-		return x.ListenerPort
-	}
-	return 0
-}
-
-func (x *ProxyConfig) GetConnectTimeout() uint32 {
-	if x != nil {
-		return x.ConnectTimeout
-	}
-	return 0
-}
-
-type InnerMap struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	InnerMap map[string]string `protobuf:"bytes,1,rep,name=inner_map,json=innerMap,proto3" json:"inner_map,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-}
-
-func (x *InnerMap) Reset() {
-	*x = InnerMap{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_networking_v1_mcp_bridge_proto_msgTypes[3]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *InnerMap) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*InnerMap) ProtoMessage() {}
-
-func (x *InnerMap) ProtoReflect() protoreflect.Message {
-	mi := &file_networking_v1_mcp_bridge_proto_msgTypes[3]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use InnerMap.ProtoReflect.Descriptor instead.
-func (*InnerMap) Descriptor() ([]byte, []int) {
-	return file_networking_v1_mcp_bridge_proto_rawDescGZIP(), []int{3}
-}
-
-func (x *InnerMap) GetInnerMap() map[string]string {
-	if x != nil {
-		return x.InnerMap
-	}
-	return nil
-}
-
-type RegistryConfig_VPort struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Default  uint32                           `protobuf:"varint,1,opt,name=default,proto3" json:"default,omitempty"`
-	Services []*RegistryConfig_VPort_Services `protobuf:"bytes,2,rep,name=services,proto3" json:"services,omitempty"`
-}
-
-func (x *RegistryConfig_VPort) Reset() {
-	*x = RegistryConfig_VPort{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_networking_v1_mcp_bridge_proto_msgTypes[5]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *RegistryConfig_VPort) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*RegistryConfig_VPort) ProtoMessage() {}
-
-func (x *RegistryConfig_VPort) ProtoReflect() protoreflect.Message {
-	mi := &file_networking_v1_mcp_bridge_proto_msgTypes[5]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use RegistryConfig_VPort.ProtoReflect.Descriptor instead.
-func (*RegistryConfig_VPort) Descriptor() ([]byte, []int) {
-	return file_networking_v1_mcp_bridge_proto_rawDescGZIP(), []int{1, 1}
-}
-
-func (x *RegistryConfig_VPort) GetDefault() uint32 {
-	if x != nil {
-		return x.Default
-	}
-	return 0
-}
-
-func (x *RegistryConfig_VPort) GetServices() []*RegistryConfig_VPort_Services {
-	if x != nil {
-		return x.Services
-	}
-	return nil
-}
-
-type RegistryConfig_VPort_Services struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Name  string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
-	Value uint32 `protobuf:"varint,2,opt,name=value,proto3" json:"value,omitempty"`
-}
-
-func (x *RegistryConfig_VPort_Services) Reset() {
-	*x = RegistryConfig_VPort_Services{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_networking_v1_mcp_bridge_proto_msgTypes[6]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *RegistryConfig_VPort_Services) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*RegistryConfig_VPort_Services) ProtoMessage() {}
-
-func (x *RegistryConfig_VPort_Services) ProtoReflect() protoreflect.Message {
-	mi := &file_networking_v1_mcp_bridge_proto_msgTypes[6]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use RegistryConfig_VPort_Services.ProtoReflect.Descriptor instead.
-func (*RegistryConfig_VPort_Services) Descriptor() ([]byte, []int) {
-	return file_networking_v1_mcp_bridge_proto_rawDescGZIP(), []int{1, 1, 0}
-}
-
-func (x *RegistryConfig_VPort_Services) GetName() string {
-	if x != nil {
-		return x.Name
-	}
-	return ""
-}
-
-func (x *RegistryConfig_VPort_Services) GetValue() uint32 {
-	if x != nil {
-		return x.Value
-	}
-	return 0
-}
-
 var File_networking_v1_mcp_bridge_proto protoreflect.FileDescriptor

 var file_networking_v1_mcp_bridge_proto_rawDesc = []byte{
@@ -625,134 +333,72 @@ var file_networking_v1_mcp_bridge_proto_rawDesc = []byte{
 	0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x77, 0x72, 0x61, 0x70, 0x70, 0x65,
 	0x72, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1c, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
 	0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x90, 0x01, 0x0a, 0x09, 0x4d, 0x63, 0x70, 0x42, 0x72,
-	0x69, 0x64, 0x67, 0x65, 0x12, 0x45, 0x0a, 0x0a, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x69,
-	0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x68, 0x69, 0x67, 0x72, 0x65,
-	0x73, 0x73, 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x69, 0x6e, 0x67, 0x2e, 0x76, 0x31,
-	0x2e, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x79, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52,
-	0x0a, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x69, 0x65, 0x73, 0x12, 0x3c, 0x0a, 0x07, 0x70,
-	0x72, 0x6f, 0x78, 0x69, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x68,
-	0x69, 0x67, 0x72, 0x65, 0x73, 0x73, 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x69, 0x6e,
-	0x67, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x52, 0x07, 0x70, 0x72, 0x6f, 0x78, 0x69, 0x65, 0x73, 0x22, 0xb5, 0x0b, 0x0a, 0x0e, 0x52, 0x65,
-	0x67, 0x69, 0x73, 0x74, 0x72, 0x79, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x17, 0x0a, 0x04,
-	0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xe0, 0x41, 0x02, 0x52,
-	0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1b, 0x0a, 0x06, 0x64, 0x6f, 0x6d,
-	0x61, 0x69, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xe0, 0x41, 0x02, 0x52, 0x06,
-	0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12, 0x17, 0x0a, 0x04, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x04,
-	0x20, 0x01, 0x28, 0x0d, 0x42, 0x03, 0xe0, 0x41, 0x02, 0x52, 0x04, 0x70, 0x6f, 0x72, 0x74, 0x12,
-	0x2e, 0x0a, 0x12, 0x6e, 0x61, 0x63, 0x6f, 0x73, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x53,
-	0x65, 0x72, 0x76, 0x65, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x12, 0x6e, 0x61, 0x63,
-	0x6f, 0x73, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x12,
-	0x26, 0x0a, 0x0e, 0x6e, 0x61, 0x63, 0x6f, 0x73, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x4b, 0x65,
-	0x79, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x6e, 0x61, 0x63, 0x6f, 0x73, 0x41, 0x63,
-	0x63, 0x65, 0x73, 0x73, 0x4b, 0x65, 0x79, 0x12, 0x26, 0x0a, 0x0e, 0x6e, 0x61, 0x63, 0x6f, 0x73,
-	0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x4b, 0x65, 0x79, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x0e, 0x6e, 0x61, 0x63, 0x6f, 0x73, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x4b, 0x65, 0x79, 0x12,
-	0x2a, 0x0a, 0x10, 0x6e, 0x61, 0x63, 0x6f, 0x73, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63,
-	0x65, 0x49, 0x64, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x6e, 0x61, 0x63, 0x6f, 0x73,
-	0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x49, 0x64, 0x12, 0x26, 0x0a, 0x0e, 0x6e,
-	0x61, 0x63, 0x6f, 0x73, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x09, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x0e, 0x6e, 0x61, 0x63, 0x6f, 0x73, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70,
-	0x61, 0x63, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x6e, 0x61, 0x63, 0x6f, 0x73, 0x47, 0x72, 0x6f, 0x75,
-	0x70, 0x73, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0b, 0x6e, 0x61, 0x63, 0x6f, 0x73, 0x47,
-	0x72, 0x6f, 0x75, 0x70, 0x73, 0x12, 0x32, 0x0a, 0x14, 0x6e, 0x61, 0x63, 0x6f, 0x73, 0x52, 0x65,
-	0x66, 0x72, 0x65, 0x73, 0x68, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x18, 0x0b, 0x20,
-	0x01, 0x28, 0x03, 0x52, 0x14, 0x6e, 0x61, 0x63, 0x6f, 0x73, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73,
-	0x68, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x12, 0x28, 0x0a, 0x0f, 0x63, 0x6f, 0x6e,
-	0x73, 0x75, 0x6c, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x0c, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x0f, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70,
-	0x61, 0x63, 0x65, 0x12, 0x26, 0x0a, 0x0e, 0x7a, 0x6b, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
-	0x73, 0x50, 0x61, 0x74, 0x68, 0x18, 0x0d, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0e, 0x7a, 0x6b, 0x53,
-	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x50, 0x61, 0x74, 0x68, 0x12, 0x2a, 0x0a, 0x10, 0x63,
-	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x44, 0x61, 0x74, 0x61, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x18,
-	0x0e, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x44, 0x61, 0x74,
-	0x61, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x12, 0x2a, 0x0a, 0x10, 0x63, 0x6f, 0x6e, 0x73, 0x75,
-	0x6c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x54, 0x61, 0x67, 0x18, 0x0f, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x10, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
-	0x54, 0x61, 0x67, 0x12, 0x34, 0x0a, 0x15, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x52, 0x65, 0x66,
-	0x72, 0x65, 0x73, 0x68, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x18, 0x10, 0x20, 0x01,
-	0x28, 0x03, 0x52, 0x15, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73,
-	0x68, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x12, 0x26, 0x0a, 0x0e, 0x61, 0x75, 0x74,
-	0x68, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x11, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x0e, 0x61, 0x75, 0x74, 0x68, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x4e, 0x61, 0x6d,
-	0x65, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x18, 0x12, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x12, 0x10, 0x0a,
-	0x03, 0x73, 0x6e, 0x69, 0x18, 0x13, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x73, 0x6e, 0x69, 0x12,
-	0x36, 0x0a, 0x16, 0x6d, 0x63, 0x70, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x45, 0x78, 0x70, 0x6f,
-	0x72, 0x74, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x73, 0x18, 0x14, 0x20, 0x03, 0x28, 0x09, 0x52,
-	0x16, 0x6d, 0x63, 0x70, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74,
-	0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x73, 0x12, 0x2a, 0x0a, 0x10, 0x6d, 0x63, 0x70, 0x53, 0x65,
-	0x72, 0x76, 0x65, 0x72, 0x42, 0x61, 0x73, 0x65, 0x55, 0x72, 0x6c, 0x18, 0x15, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x10, 0x6d, 0x63, 0x70, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x42, 0x61, 0x73, 0x65,
-	0x55, 0x72, 0x6c, 0x12, 0x44, 0x0a, 0x0f, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x4d, 0x43, 0x50,
-	0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x18, 0x16, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67,
-	0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42,
-	0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x0f, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65,
-	0x4d, 0x43, 0x50, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x12, 0x50, 0x0a, 0x15, 0x65, 0x6e, 0x61,
-	0x62, 0x6c, 0x65, 0x53, 0x63, 0x6f, 0x70, 0x65, 0x4d, 0x63, 0x70, 0x53, 0x65, 0x72, 0x76, 0x65,
-	0x72, 0x73, 0x18, 0x17, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
-	0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56,
-	0x61, 0x6c, 0x75, 0x65, 0x52, 0x15, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x53, 0x63, 0x6f, 0x70,
-	0x65, 0x4d, 0x63, 0x70, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x73, 0x12, 0x28, 0x0a, 0x0f, 0x61,
-	0x6c, 0x6c, 0x6f, 0x77, 0x4d, 0x63, 0x70, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x73, 0x18, 0x18,
-	0x20, 0x03, 0x28, 0x09, 0x52, 0x0f, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x4d, 0x63, 0x70, 0x53, 0x65,
-	0x72, 0x76, 0x65, 0x72, 0x73, 0x12, 0x4f, 0x0a, 0x08, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74,
-	0x61, 0x18, 0x19, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x33, 0x2e, 0x68, 0x69, 0x67, 0x72, 0x65, 0x73,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x52, 0x0a, 0x09, 0x4d, 0x63, 0x70, 0x42, 0x72, 0x69,
+	0x64, 0x67, 0x65, 0x12, 0x45, 0x0a, 0x0a, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x69, 0x65,
+	0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x68, 0x69, 0x67, 0x72, 0x65, 0x73,
 	0x73, 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x69, 0x6e, 0x67, 0x2e, 0x76, 0x31, 0x2e,
-	0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x79, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x4d,
-	0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x6d, 0x65,
-	0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x12, 0x1c, 0x0a, 0x09, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x4e,
-	0x61, 0x6d, 0x65, 0x18, 0x1a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x70, 0x72, 0x6f, 0x78, 0x79,
-	0x4e, 0x61, 0x6d, 0x65, 0x12, 0x41, 0x0a, 0x05, 0x76, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x1b, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x2b, 0x2e, 0x68, 0x69, 0x67, 0x72, 0x65, 0x73, 0x73, 0x2e, 0x6e, 0x65,
-	0x74, 0x77, 0x6f, 0x72, 0x6b, 0x69, 0x6e, 0x67, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x67, 0x69,
-	0x73, 0x74, 0x72, 0x79, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x56, 0x50, 0x6f, 0x72, 0x74,
-	0x52, 0x05, 0x76, 0x70, 0x6f, 0x72, 0x74, 0x1a, 0x5c, 0x0a, 0x0d, 0x4d, 0x65, 0x74, 0x61, 0x64,
-	0x61, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x35, 0x0a, 0x05, 0x76, 0x61,
-	0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x68, 0x69, 0x67, 0x72,
-	0x65, 0x73, 0x73, 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x69, 0x6e, 0x67, 0x2e, 0x76,
-	0x31, 0x2e, 0x49, 0x6e, 0x6e, 0x65, 0x72, 0x4d, 0x61, 0x70, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75,
-	0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0xa9, 0x01, 0x0a, 0x05, 0x56, 0x50, 0x6f, 0x72, 0x74, 0x12,
-	0x18, 0x0a, 0x07, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d,
-	0x52, 0x07, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x12, 0x50, 0x0a, 0x08, 0x73, 0x65, 0x72,
-	0x76, 0x69, 0x63, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x34, 0x2e, 0x68, 0x69,
-	0x67, 0x72, 0x65, 0x73, 0x73, 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x69, 0x6e, 0x67,
-	0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x79, 0x43, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x2e, 0x56, 0x50, 0x6f, 0x72, 0x74, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
-	0x73, 0x52, 0x08, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x1a, 0x34, 0x0a, 0x08, 0x53,
-	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x76,
-	0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75,
-	0x65, 0x22, 0xdb, 0x01, 0x0a, 0x0b, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x43, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x12, 0x17, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42,
-	0x03, 0xe0, 0x41, 0x02, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x17, 0x0a, 0x04, 0x6e, 0x61,
-	0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xe0, 0x41, 0x02, 0x52, 0x04, 0x6e,
-	0x61, 0x6d, 0x65, 0x12, 0x29, 0x0a, 0x0d, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x41, 0x64, 0x64,
-	0x72, 0x65, 0x73, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xe0, 0x41, 0x02, 0x52,
-	0x0d, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x23,
-	0x0a, 0x0a, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x50, 0x6f, 0x72, 0x74, 0x18, 0x04, 0x20, 0x01,
-	0x28, 0x0d, 0x42, 0x03, 0xe0, 0x41, 0x02, 0x52, 0x0a, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x50,
-	0x6f, 0x72, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x50,
-	0x6f, 0x72, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0c, 0x6c, 0x69, 0x73, 0x74, 0x65,
-	0x6e, 0x65, 0x72, 0x50, 0x6f, 0x72, 0x74, 0x12, 0x26, 0x0a, 0x0e, 0x63, 0x6f, 0x6e, 0x6e, 0x65,
-	0x63, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0d, 0x52,
-	0x0e, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x22,
-	0x93, 0x01, 0x0a, 0x08, 0x49, 0x6e, 0x6e, 0x65, 0x72, 0x4d, 0x61, 0x70, 0x12, 0x4a, 0x0a, 0x09,
-	0x69, 0x6e, 0x6e, 0x65, 0x72, 0x5f, 0x6d, 0x61, 0x70, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32,
-	0x2d, 0x2e, 0x68, 0x69, 0x67, 0x72, 0x65, 0x73, 0x73, 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72,
-	0x6b, 0x69, 0x6e, 0x67, 0x2e, 0x76, 0x31, 0x2e, 0x49, 0x6e, 0x6e, 0x65, 0x72, 0x4d, 0x61, 0x70,
-	0x2e, 0x49, 0x6e, 0x6e, 0x65, 0x72, 0x4d, 0x61, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08,
-	0x69, 0x6e, 0x6e, 0x65, 0x72, 0x4d, 0x61, 0x70, 0x1a, 0x3b, 0x0a, 0x0d, 0x49, 0x6e, 0x6e, 0x65,
-	0x72, 0x4d, 0x61, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76,
-	0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75,
-	0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x2e, 0x5a, 0x2c, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e,
-	0x63, 0x6f, 0x6d, 0x2f, 0x61, 0x6c, 0x69, 0x62, 0x61, 0x62, 0x61, 0x2f, 0x68, 0x69, 0x67, 0x72,
-	0x65, 0x73, 0x73, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x69,
-	0x6e, 0x67, 0x2f, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x79, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x0a,
+	0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x69, 0x65, 0x73, 0x22, 0xfd, 0x06, 0x0a, 0x0e, 0x52,
+	0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x79, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x17, 0x0a,
+	0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xe0, 0x41, 0x02,
+	0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1b, 0x0a, 0x06, 0x64, 0x6f,
+	0x6d, 0x61, 0x69, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xe0, 0x41, 0x02, 0x52,
+	0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12, 0x17, 0x0a, 0x04, 0x70, 0x6f, 0x72, 0x74, 0x18,
+	0x04, 0x20, 0x01, 0x28, 0x0d, 0x42, 0x03, 0xe0, 0x41, 0x02, 0x52, 0x04, 0x70, 0x6f, 0x72, 0x74,
+	0x12, 0x2e, 0x0a, 0x12, 0x6e, 0x61, 0x63, 0x6f, 0x73, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73,
+	0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x12, 0x6e, 0x61,
+	0x63, 0x6f, 0x73, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72,
+	0x12, 0x26, 0x0a, 0x0e, 0x6e, 0x61, 0x63, 0x6f, 0x73, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x4b,
+	0x65, 0x79, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x6e, 0x61, 0x63, 0x6f, 0x73, 0x41,
+	0x63, 0x63, 0x65, 0x73, 0x73, 0x4b, 0x65, 0x79, 0x12, 0x26, 0x0a, 0x0e, 0x6e, 0x61, 0x63, 0x6f,
+	0x73, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x4b, 0x65, 0x79, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x0e, 0x6e, 0x61, 0x63, 0x6f, 0x73, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x4b, 0x65, 0x79,
+	0x12, 0x2a, 0x0a, 0x10, 0x6e, 0x61, 0x63, 0x6f, 0x73, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61,
+	0x63, 0x65, 0x49, 0x64, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x6e, 0x61, 0x63, 0x6f,
+	0x73, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x49, 0x64, 0x12, 0x26, 0x0a, 0x0e,
+	0x6e, 0x61, 0x63, 0x6f, 0x73, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x09,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x6e, 0x61, 0x63, 0x6f, 0x73, 0x4e, 0x61, 0x6d, 0x65, 0x73,
+	0x70, 0x61, 0x63, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x6e, 0x61, 0x63, 0x6f, 0x73, 0x47, 0x72, 0x6f,
+	0x75, 0x70, 0x73, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0b, 0x6e, 0x61, 0x63, 0x6f, 0x73,
+	0x47, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x12, 0x32, 0x0a, 0x14, 0x6e, 0x61, 0x63, 0x6f, 0x73, 0x52,
+	0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x18, 0x0b,
+	0x20, 0x01, 0x28, 0x03, 0x52, 0x14, 0x6e, 0x61, 0x63, 0x6f, 0x73, 0x52, 0x65, 0x66, 0x72, 0x65,
+	0x73, 0x68, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x12, 0x28, 0x0a, 0x0f, 0x63, 0x6f,
+	0x6e, 0x73, 0x75, 0x6c, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x0c, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x0f, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x4e, 0x61, 0x6d, 0x65, 0x73,
+	0x70, 0x61, 0x63, 0x65, 0x12, 0x26, 0x0a, 0x0e, 0x7a, 0x6b, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63,
+	0x65, 0x73, 0x50, 0x61, 0x74, 0x68, 0x18, 0x0d, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0e, 0x7a, 0x6b,
+	0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x50, 0x61, 0x74, 0x68, 0x12, 0x2a, 0x0a, 0x10,
+	0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x44, 0x61, 0x74, 0x61, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72,
+	0x18, 0x0e, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x44, 0x61,
+	0x74, 0x61, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x12, 0x2a, 0x0a, 0x10, 0x63, 0x6f, 0x6e, 0x73,
+	0x75, 0x6c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x54, 0x61, 0x67, 0x18, 0x0f, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x10, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63,
+	0x65, 0x54, 0x61, 0x67, 0x12, 0x34, 0x0a, 0x15, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x52, 0x65,
+	0x66, 0x72, 0x65, 0x73, 0x68, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x18, 0x10, 0x20,
+	0x01, 0x28, 0x03, 0x52, 0x15, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x52, 0x65, 0x66, 0x72, 0x65,
+	0x73, 0x68, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x12, 0x26, 0x0a, 0x0e, 0x61, 0x75,
+	0x74, 0x68, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x11, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x0e, 0x61, 0x75, 0x74, 0x68, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x4e, 0x61,
+	0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x18, 0x12,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x12, 0x10,
+	0x0a, 0x03, 0x73, 0x6e, 0x69, 0x18, 0x13, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x73, 0x6e, 0x69,
+	0x12, 0x36, 0x0a, 0x16, 0x6d, 0x63, 0x70, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x45, 0x78, 0x70,
+	0x6f, 0x72, 0x74, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x73, 0x18, 0x14, 0x20, 0x03, 0x28, 0x09,
+	0x52, 0x16, 0x6d, 0x63, 0x70, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x45, 0x78, 0x70, 0x6f, 0x72,
+	0x74, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x73, 0x12, 0x2a, 0x0a, 0x10, 0x6d, 0x63, 0x70, 0x53,
+	0x65, 0x72, 0x76, 0x65, 0x72, 0x42, 0x61, 0x73, 0x65, 0x55, 0x72, 0x6c, 0x18, 0x15, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x10, 0x6d, 0x63, 0x70, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x42, 0x61, 0x73,
+	0x65, 0x55, 0x72, 0x6c, 0x12, 0x44, 0x0a, 0x0f, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x4d, 0x43,
+	0x50, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x18, 0x16, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e,
+	0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e,
+	0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x0f, 0x65, 0x6e, 0x61, 0x62, 0x6c,
+	0x65, 0x4d, 0x43, 0x50, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x42, 0x2e, 0x5a, 0x2c, 0x67, 0x69,
+	0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x61, 0x6c, 0x69, 0x62, 0x61, 0x62, 0x61,
+	0x2f, 0x68, 0x69, 0x67, 0x72, 0x65, 0x73, 0x73, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x6e, 0x65, 0x74,
+	0x77, 0x6f, 0x72, 0x6b, 0x69, 0x6e, 0x67, 0x2f, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x33,
 }

 var (
@@ -767,33 +413,20 @@ func file_networking_v1_mcp_bridge_proto_rawDescGZIP() []byte {
 	return file_networking_v1_mcp_bridge_proto_rawDescData
 }

-var file_networking_v1_mcp_bridge_proto_msgTypes = make([]protoimpl.MessageInfo, 8)
+var file_networking_v1_mcp_bridge_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
 var file_networking_v1_mcp_bridge_proto_goTypes = []interface{}{
-	(*McpBridge)(nil),                     // 0: higress.networking.v1.McpBridge
-	(*RegistryConfig)(nil),                // 1: higress.networking.v1.RegistryConfig
-	(*ProxyConfig)(nil),                   // 2: higress.networking.v1.ProxyConfig
-	(*InnerMap)(nil),                      // 3: higress.networking.v1.InnerMap
-	nil,                                   // 4: higress.networking.v1.RegistryConfig.MetadataEntry
-	(*RegistryConfig_VPort)(nil),          // 5: higress.networking.v1.RegistryConfig.VPort
-	(*RegistryConfig_VPort_Services)(nil), // 6: higress.networking.v1.RegistryConfig.VPort.Services
-	nil,                                   // 7: higress.networking.v1.InnerMap.InnerMapEntry
-	(*wrappers.BoolValue)(nil),            // 8: google.protobuf.BoolValue
+	(*McpBridge)(nil),          // 0: higress.networking.v1.McpBridge
+	(*RegistryConfig)(nil),     // 1: higress.networking.v1.RegistryConfig
+	(*wrappers.BoolValue)(nil), // 2: google.protobuf.BoolValue
 }
 var file_networking_v1_mcp_bridge_proto_depIdxs = []int32{
 	1, // 0: higress.networking.v1.McpBridge.registries:type_name -> higress.networking.v1.RegistryConfig
-	2, // 1: higress.networking.v1.McpBridge.proxies:type_name -> higress.networking.v1.ProxyConfig
-	8, // 2: higress.networking.v1.RegistryConfig.enableMCPServer:type_name -> google.protobuf.BoolValue
-	8, // 3: higress.networking.v1.RegistryConfig.enableScopeMcpServers:type_name -> google.protobuf.BoolValue
-	4, // 4: higress.networking.v1.RegistryConfig.metadata:type_name -> higress.networking.v1.RegistryConfig.MetadataEntry
-	5, // 5: higress.networking.v1.RegistryConfig.vport:type_name -> higress.networking.v1.RegistryConfig.VPort
-	7, // 6: higress.networking.v1.InnerMap.inner_map:type_name -> higress.networking.v1.InnerMap.InnerMapEntry
-	3, // 7: higress.networking.v1.RegistryConfig.MetadataEntry.value:type_name -> higress.networking.v1.InnerMap
-	6, // 8: higress.networking.v1.RegistryConfig.VPort.services:type_name -> higress.networking.v1.RegistryConfig.VPort.Services
-	9, // [9:9] is the sub-list for method output_type
-	9, // [9:9] is the sub-list for method input_type
-	9, // [9:9] is the sub-list for extension type_name
-	9, // [9:9] is the sub-list for extension extendee
-	0, // [0:9] is the sub-list for field type_name
+	2, // 1: higress.networking.v1.RegistryConfig.enableMCPServer:type_name -> google.protobuf.BoolValue
+	2, // [2:2] is the sub-list for method output_type
+	2, // [2:2] is the sub-list for method input_type
+	2, // [2:2] is the sub-list for extension type_name
+	2, // [2:2] is the sub-list for extension extendee
+	0, // [0:2] is the sub-list for field type_name
 }

 func init() { file_networking_v1_mcp_bridge_proto_init() }
@@ -826,54 +459,6 @@ func file_networking_v1_mcp_bridge_proto_init() {
 				return nil
 			}
 		}
-		file_networking_v1_mcp_bridge_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ProxyConfig); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_networking_v1_mcp_bridge_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*InnerMap); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_networking_v1_mcp_bridge_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RegistryConfig_VPort); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_networking_v1_mcp_bridge_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RegistryConfig_VPort_Services); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
 	}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
@@ -881,7 +466,7 @@ func file_networking_v1_mcp_bridge_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_networking_v1_mcp_bridge_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   8,
+			NumMessages:   2,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
--- a/api/networking/v1/mcp_bridge.proto
+++ b/api/networking/v1/mcp_bridge.proto
@@ -1,11 +1,11 @@
 // Copyright (c) 2022 Alibaba Group Holding Ltd.
-//
+//  
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
-//
+//  
 //      http://www.apache.org/licenses/LICENSE-2.0
-//
+//  
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -25,7 +25,7 @@ import "google/protobuf/struct.proto";

 package higress.networking.v1;

-option go_package = "github.com/alibaba/higress/v2/api/networking/v1";
+option go_package = "github.com/alibaba/higress/api/networking/v1";

 // <!-- crd generation tags
 // +cue-gen:McpBridge:groupName:networking.higress.io
@@ -46,11 +46,10 @@ option go_package = "github.com/alibaba/higress/v2/api/networking/v1";
 // -->
 message McpBridge {
  repeated RegistryConfig registries = 1;
-  repeated ProxyConfig proxies = 2;
 }

 message RegistryConfig {
-  string type = 1 [(google.api.field_behavior) = REQUIRED];
+  string type = 1 [(google.api.field_behavior) = REQUIRED]; 
  string name = 2;
  string domain = 3 [(google.api.field_behavior) = REQUIRED];
  uint32 port = 4 [(google.api.field_behavior) = REQUIRED];
@@ -72,30 +71,4 @@ message RegistryConfig {
  repeated string mcpServerExportDomains = 20;
  string mcpServerBaseUrl = 21;
  google.protobuf.BoolValue enableMCPServer = 22;
-  google.protobuf.BoolValue enableScopeMcpServers = 23;
-  repeated string allowMcpServers = 24;
-  map<string, InnerMap> metadata = 25;
-  string proxyName = 26;
-  message VPort {
-    uint32 default = 1;
-    message Services {
-      string name = 1;
-      uint32 value = 2;
-    }
-    repeated Services services = 2;
-  }
-  VPort vport = 27;
 }
-
-message ProxyConfig {
-  string type = 1 [(google.api.field_behavior) = REQUIRED];
-  string name = 2 [(google.api.field_behavior) = REQUIRED];
-  string serverAddress = 3 [(google.api.field_behavior) = REQUIRED];
-  uint32 serverPort = 4 [(google.api.field_behavior) = REQUIRED];
-  uint32 listenerPort = 5;
-  uint32 connectTimeout = 6;
-}
-
-message InnerMap {
-  map<string, string> inner_map = 1;
-}
--- a/api/networking/v1/mcp_bridge_deepcopy.gen.go
+++ b/api/networking/v1/mcp_bridge_deepcopy.gen.go
@@ -46,87 +46,3 @@ func (in *RegistryConfig) DeepCopy() *RegistryConfig {
 func (in *RegistryConfig) DeepCopyInterface() interface{} {
 	return in.DeepCopy()
 }
-
-// DeepCopyInto supports using RegistryConfig_VPort within kubernetes types, where deepcopy-gen is used.
-func (in *RegistryConfig_VPort) DeepCopyInto(out *RegistryConfig_VPort) {
-	p := proto.Clone(in).(*RegistryConfig_VPort)
-	*out = *p
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RegistryConfig_VPort. Required by controller-gen.
-func (in *RegistryConfig_VPort) DeepCopy() *RegistryConfig_VPort {
-	if in == nil {
-		return nil
-	}
-	out := new(RegistryConfig_VPort)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInterface is an autogenerated deepcopy function, copying the receiver, creating a new RegistryConfig_VPort. Required by controller-gen.
-func (in *RegistryConfig_VPort) DeepCopyInterface() interface{} {
-	return in.DeepCopy()
-}
-
-// DeepCopyInto supports using RegistryConfig_VPort_Services within kubernetes types, where deepcopy-gen is used.
-func (in *RegistryConfig_VPort_Services) DeepCopyInto(out *RegistryConfig_VPort_Services) {
-	p := proto.Clone(in).(*RegistryConfig_VPort_Services)
-	*out = *p
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RegistryConfig_VPort_Services. Required by controller-gen.
-func (in *RegistryConfig_VPort_Services) DeepCopy() *RegistryConfig_VPort_Services {
-	if in == nil {
-		return nil
-	}
-	out := new(RegistryConfig_VPort_Services)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInterface is an autogenerated deepcopy function, copying the receiver, creating a new RegistryConfig_VPort_Services. Required by controller-gen.
-func (in *RegistryConfig_VPort_Services) DeepCopyInterface() interface{} {
-	return in.DeepCopy()
-}
-
-// DeepCopyInto supports using ProxyConfig within kubernetes types, where deepcopy-gen is used.
-func (in *ProxyConfig) DeepCopyInto(out *ProxyConfig) {
-	p := proto.Clone(in).(*ProxyConfig)
-	*out = *p
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ProxyConfig. Required by controller-gen.
-func (in *ProxyConfig) DeepCopy() *ProxyConfig {
-	if in == nil {
-		return nil
-	}
-	out := new(ProxyConfig)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInterface is an autogenerated deepcopy function, copying the receiver, creating a new ProxyConfig. Required by controller-gen.
-func (in *ProxyConfig) DeepCopyInterface() interface{} {
-	return in.DeepCopy()
-}
-
-// DeepCopyInto supports using InnerMap within kubernetes types, where deepcopy-gen is used.
-func (in *InnerMap) DeepCopyInto(out *InnerMap) {
-	p := proto.Clone(in).(*InnerMap)
-	*out = *p
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new InnerMap. Required by controller-gen.
-func (in *InnerMap) DeepCopy() *InnerMap {
-	if in == nil {
-		return nil
-	}
-	out := new(InnerMap)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInterface is an autogenerated deepcopy function, copying the receiver, creating a new InnerMap. Required by controller-gen.
-func (in *InnerMap) DeepCopyInterface() interface{} {
-	return in.DeepCopy()
-}
--- a/api/networking/v1/mcp_bridge_json.gen.go
+++ b/api/networking/v1/mcp_bridge_json.gen.go
@@ -28,50 +28,6 @@ func (this *RegistryConfig) UnmarshalJSON(b []byte) error {
 	return McpBridgeUnmarshaler.Unmarshal(bytes.NewReader(b), this)
 }

-// MarshalJSON is a custom marshaler for RegistryConfig_VPort
-func (this *RegistryConfig_VPort) MarshalJSON() ([]byte, error) {
-	str, err := McpBridgeMarshaler.MarshalToString(this)
-	return []byte(str), err
-}
-
-// UnmarshalJSON is a custom unmarshaler for RegistryConfig_VPort
-func (this *RegistryConfig_VPort) UnmarshalJSON(b []byte) error {
-	return McpBridgeUnmarshaler.Unmarshal(bytes.NewReader(b), this)
-}
-
-// MarshalJSON is a custom marshaler for RegistryConfig_VPort_Services
-func (this *RegistryConfig_VPort_Services) MarshalJSON() ([]byte, error) {
-	str, err := McpBridgeMarshaler.MarshalToString(this)
-	return []byte(str), err
-}
-
-// UnmarshalJSON is a custom unmarshaler for RegistryConfig_VPort_Services
-func (this *RegistryConfig_VPort_Services) UnmarshalJSON(b []byte) error {
-	return McpBridgeUnmarshaler.Unmarshal(bytes.NewReader(b), this)
-}
-
-// MarshalJSON is a custom marshaler for ProxyConfig
-func (this *ProxyConfig) MarshalJSON() ([]byte, error) {
-	str, err := McpBridgeMarshaler.MarshalToString(this)
-	return []byte(str), err
-}
-
-// UnmarshalJSON is a custom unmarshaler for ProxyConfig
-func (this *ProxyConfig) UnmarshalJSON(b []byte) error {
-	return McpBridgeUnmarshaler.Unmarshal(bytes.NewReader(b), this)
-}
-
-// MarshalJSON is a custom marshaler for InnerMap
-func (this *InnerMap) MarshalJSON() ([]byte, error) {
-	str, err := McpBridgeMarshaler.MarshalToString(this)
-	return []byte(str), err
-}
-
-// UnmarshalJSON is a custom unmarshaler for InnerMap
-func (this *InnerMap) UnmarshalJSON(b []byte) error {
-	return McpBridgeUnmarshaler.Unmarshal(bytes.NewReader(b), this)
-}
-
 var (
 	McpBridgeMarshaler   = &jsonpb.Marshaler{}
 	McpBridgeUnmarshaler = &jsonpb.Unmarshaler{AllowUnknownFields: true}
--- a/client/Makefile
+++ b/client/Makefile
@@ -29,12 +29,12 @@ comma := ,

 # source packages to scan for kubetype-gen tags
 kube_source_packages = $(subst $(space),$(empty), \
-	github.com/alibaba/higress/v2/api/networking/v1, \
-	github.com/alibaba/higress/v2/api/extensions/v1alpha1 \
+	github.com/alibaba/higress/api/networking/v1, \
+	github.com/alibaba/higress/api/extensions/v1alpha1 \
 	)

 # base output package for generated files
-kube_base_output_package = github.com/alibaba/higress/v2/client/pkg
+kube_base_output_package = github.com/alibaba/higress/client/pkg
 # base output package for kubernetes types, register, etc...
 kube_api_base_package = $(kube_base_output_package)/apis
 # source packages to scan for kubernetes generator tags, e.g. deepcopy-gen, client-gen, etc.
@@ -72,7 +72,7 @@ else
 endif

 rename_generated_files=\
-	find $(subst github.com/alibaba/higress/v2/client/, $(empty), $(subst $(comma), $(space), $(kube_api_packages)) $(kube_clientset_package) $(kube_listers_package) $(kube_informers_package)) \
+	find $(subst github.com/alibaba/higress/client/, $(empty), $(subst $(comma), $(space), $(kube_api_packages)) $(kube_clientset_package) $(kube_listers_package) $(kube_informers_package)) \
 	-name '*.go' -and -not -name 'doc.go' -and -not -name '*.gen.go' -type f -exec sh -c 'mv "$$1" "$${1%.go}".gen.go' - '{}' \;

 .PHONY: generate-k8s-client
@@ -95,6 +95,6 @@ generate-k8s-client:


 .PHONY: clean-k8s-client
-clean-k8s-client:
+clean-k8s-cliennt:
    # remove generated code
 	@rm -rf pkg/
--- a/client/pkg/apis/extensions/v1alpha1/types.gen.go
+++ b/client/pkg/apis/extensions/v1alpha1/types.gen.go
@@ -17,7 +17,7 @@
 package v1alpha1

 import (
-	extensionsv1alpha1 "github.com/alibaba/higress/v2/api/extensions/v1alpha1"
+	extensionsv1alpha1 "github.com/alibaba/higress/api/extensions/v1alpha1"
 	metav1alpha1 "istio.io/api/meta/v1alpha1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
--- a/client/pkg/apis/networking/v1/types.gen.go
+++ b/client/pkg/apis/networking/v1/types.gen.go
@@ -17,7 +17,7 @@
 package v1

 import (
-	networkingv1 "github.com/alibaba/higress/v2/api/networking/v1"
+	networkingv1 "github.com/alibaba/higress/api/networking/v1"
 	v1alpha1 "istio.io/api/meta/v1alpha1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
--- a/client/pkg/applyconfiguration/extensions/v1alpha1/wasmplugin.go
+++ b/client/pkg/applyconfiguration/extensions/v1alpha1/wasmplugin.go
@@ -17,8 +17,8 @@
 package v1alpha1

 import (
-	v1alpha1 "github.com/alibaba/higress/v2/api/extensions/v1alpha1"
-	v1 "github.com/alibaba/higress/v2/client/pkg/applyconfiguration/meta/v1"
+	v1alpha1 "github.com/alibaba/higress/api/extensions/v1alpha1"
+	v1 "github.com/alibaba/higress/client/pkg/applyconfiguration/meta/v1"
 	metav1alpha1 "istio.io/api/meta/v1alpha1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	types "k8s.io/apimachinery/pkg/types"
--- a/client/pkg/applyconfiguration/networking/v1/http2rpc.go
+++ b/client/pkg/applyconfiguration/networking/v1/http2rpc.go
@@ -17,8 +17,8 @@
 package v1

 import (
-	networkingv1 "github.com/alibaba/higress/v2/api/networking/v1"
-	v1 "github.com/alibaba/higress/v2/client/pkg/applyconfiguration/meta/v1"
+	networkingv1 "github.com/alibaba/higress/api/networking/v1"
+	v1 "github.com/alibaba/higress/client/pkg/applyconfiguration/meta/v1"
 	v1alpha1 "istio.io/api/meta/v1alpha1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	types "k8s.io/apimachinery/pkg/types"
--- a/client/pkg/applyconfiguration/networking/v1/mcpbridge.go
+++ b/client/pkg/applyconfiguration/networking/v1/mcpbridge.go
@@ -17,8 +17,8 @@
 package v1

 import (
-	networkingv1 "github.com/alibaba/higress/v2/api/networking/v1"
-	v1 "github.com/alibaba/higress/v2/client/pkg/applyconfiguration/meta/v1"
+	networkingv1 "github.com/alibaba/higress/api/networking/v1"
+	v1 "github.com/alibaba/higress/client/pkg/applyconfiguration/meta/v1"
 	v1alpha1 "istio.io/api/meta/v1alpha1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	types "k8s.io/apimachinery/pkg/types"
--- a/client/pkg/applyconfiguration/utils.go
+++ b/client/pkg/applyconfiguration/utils.go
@@ -17,11 +17,11 @@
 package applyconfiguration

 import (
-	v1alpha1 "github.com/alibaba/higress/v2/client/pkg/apis/extensions/v1alpha1"
-	networkingv1 "github.com/alibaba/higress/v2/client/pkg/apis/networking/v1"
-	extensionsv1alpha1 "github.com/alibaba/higress/v2/client/pkg/applyconfiguration/extensions/v1alpha1"
-	metav1 "github.com/alibaba/higress/v2/client/pkg/applyconfiguration/meta/v1"
-	applyconfigurationnetworkingv1 "github.com/alibaba/higress/v2/client/pkg/applyconfiguration/networking/v1"
+	v1alpha1 "github.com/alibaba/higress/client/pkg/apis/extensions/v1alpha1"
+	networkingv1 "github.com/alibaba/higress/client/pkg/apis/networking/v1"
+	extensionsv1alpha1 "github.com/alibaba/higress/client/pkg/applyconfiguration/extensions/v1alpha1"
+	metav1 "github.com/alibaba/higress/client/pkg/applyconfiguration/meta/v1"
+	applyconfigurationnetworkingv1 "github.com/alibaba/higress/client/pkg/applyconfiguration/networking/v1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
 )
--- a/client/pkg/clientset/versioned/clientset.gen.go
+++ b/client/pkg/clientset/versioned/clientset.gen.go
@@ -20,8 +20,8 @@ import (
 	"fmt"
 	"net/http"

-	extensionsv1alpha1 "github.com/alibaba/higress/v2/client/pkg/clientset/versioned/typed/extensions/v1alpha1"
-	networkingv1 "github.com/alibaba/higress/v2/client/pkg/clientset/versioned/typed/networking/v1"
+	extensionsv1alpha1 "github.com/alibaba/higress/client/pkg/clientset/versioned/typed/extensions/v1alpha1"
+	networkingv1 "github.com/alibaba/higress/client/pkg/clientset/versioned/typed/networking/v1"
 	discovery "k8s.io/client-go/discovery"
 	rest "k8s.io/client-go/rest"
 	flowcontrol "k8s.io/client-go/util/flowcontrol"
--- a/client/pkg/clientset/versioned/fake/clientset_generated.gen.go
+++ b/client/pkg/clientset/versioned/fake/clientset_generated.gen.go
@@ -17,11 +17,11 @@
 package fake

 import (
-	clientset "github.com/alibaba/higress/v2/client/pkg/clientset/versioned"
-	extensionsv1alpha1 "github.com/alibaba/higress/v2/client/pkg/clientset/versioned/typed/extensions/v1alpha1"
-	fakeextensionsv1alpha1 "github.com/alibaba/higress/v2/client/pkg/clientset/versioned/typed/extensions/v1alpha1/fake"
-	networkingv1 "github.com/alibaba/higress/v2/client/pkg/clientset/versioned/typed/networking/v1"
-	fakenetworkingv1 "github.com/alibaba/higress/v2/client/pkg/clientset/versioned/typed/networking/v1/fake"
+	clientset "github.com/alibaba/higress/client/pkg/clientset/versioned"
+	extensionsv1alpha1 "github.com/alibaba/higress/client/pkg/clientset/versioned/typed/extensions/v1alpha1"
+	fakeextensionsv1alpha1 "github.com/alibaba/higress/client/pkg/clientset/versioned/typed/extensions/v1alpha1/fake"
+	networkingv1 "github.com/alibaba/higress/client/pkg/clientset/versioned/typed/networking/v1"
+	fakenetworkingv1 "github.com/alibaba/higress/client/pkg/clientset/versioned/typed/networking/v1/fake"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/watch"
 	"k8s.io/client-go/discovery"
--- a/client/pkg/clientset/versioned/fake/register.gen.go
+++ b/client/pkg/clientset/versioned/fake/register.gen.go
@@ -17,8 +17,8 @@
 package fake

 import (
-	extensionsv1alpha1 "github.com/alibaba/higress/v2/client/pkg/apis/extensions/v1alpha1"
-	networkingv1 "github.com/alibaba/higress/v2/client/pkg/apis/networking/v1"
+	extensionsv1alpha1 "github.com/alibaba/higress/client/pkg/apis/extensions/v1alpha1"
+	networkingv1 "github.com/alibaba/higress/client/pkg/apis/networking/v1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
@@ -26,10 +26,8 @@ import (
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 )

-var (
-	scheme = runtime.NewScheme()
-	codecs = serializer.NewCodecFactory(scheme)
-)
+var scheme = runtime.NewScheme()
+var codecs = serializer.NewCodecFactory(scheme)

 var localSchemeBuilder = runtime.SchemeBuilder{
 	extensionsv1alpha1.AddToScheme,
--- a/client/pkg/clientset/versioned/scheme/register.gen.go
+++ b/client/pkg/clientset/versioned/scheme/register.gen.go
@@ -17,8 +17,8 @@
 package scheme

 import (
-	extensionsv1alpha1 "github.com/alibaba/higress/v2/client/pkg/apis/extensions/v1alpha1"
-	networkingv1 "github.com/alibaba/higress/v2/client/pkg/apis/networking/v1"
+	extensionsv1alpha1 "github.com/alibaba/higress/client/pkg/apis/extensions/v1alpha1"
+	networkingv1 "github.com/alibaba/higress/client/pkg/apis/networking/v1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
@@ -26,15 +26,13 @@ import (
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 )

-var (
-	Scheme             = runtime.NewScheme()
-	Codecs             = serializer.NewCodecFactory(Scheme)
-	ParameterCodec     = runtime.NewParameterCodec(Scheme)
-	localSchemeBuilder = runtime.SchemeBuilder{
-		extensionsv1alpha1.AddToScheme,
-		networkingv1.AddToScheme,
-	}
-)
+var Scheme = runtime.NewScheme()
+var Codecs = serializer.NewCodecFactory(Scheme)
+var ParameterCodec = runtime.NewParameterCodec(Scheme)
+var localSchemeBuilder = runtime.SchemeBuilder{
+	extensionsv1alpha1.AddToScheme,
+	networkingv1.AddToScheme,
+}

 // AddToScheme adds all types of this clientset into the given scheme. This allows composition
 // of clientsets, like in:
--- a/client/pkg/clientset/versioned/typed/extensions/v1alpha1/extensions_client.gen.go
+++ b/client/pkg/clientset/versioned/typed/extensions/v1alpha1/extensions_client.gen.go
@@ -19,8 +19,8 @@ package v1alpha1
 import (
 	"net/http"

-	v1alpha1 "github.com/alibaba/higress/v2/client/pkg/apis/extensions/v1alpha1"
-	"github.com/alibaba/higress/v2/client/pkg/clientset/versioned/scheme"
+	v1alpha1 "github.com/alibaba/higress/client/pkg/apis/extensions/v1alpha1"
+	"github.com/alibaba/higress/client/pkg/clientset/versioned/scheme"
 	rest "k8s.io/client-go/rest"
 )

--- a/client/pkg/clientset/versioned/typed/extensions/v1alpha1/fake/fake_extensions_client.gen.go
+++ b/client/pkg/clientset/versioned/typed/extensions/v1alpha1/fake/fake_extensions_client.gen.go
@@ -17,7 +17,7 @@
 package fake

 import (
-	v1alpha1 "github.com/alibaba/higress/v2/client/pkg/clientset/versioned/typed/extensions/v1alpha1"
+	v1alpha1 "github.com/alibaba/higress/client/pkg/clientset/versioned/typed/extensions/v1alpha1"
 	rest "k8s.io/client-go/rest"
 	testing "k8s.io/client-go/testing"
 )
--- a/client/pkg/clientset/versioned/typed/extensions/v1alpha1/fake/fake_wasmplugin.gen.go
+++ b/client/pkg/clientset/versioned/typed/extensions/v1alpha1/fake/fake_wasmplugin.gen.go
@@ -21,8 +21,8 @@ import (
 	json "encoding/json"
 	"fmt"

-	v1alpha1 "github.com/alibaba/higress/v2/client/pkg/apis/extensions/v1alpha1"
-	extensionsv1alpha1 "github.com/alibaba/higress/v2/client/pkg/applyconfiguration/extensions/v1alpha1"
+	v1alpha1 "github.com/alibaba/higress/client/pkg/apis/extensions/v1alpha1"
+	extensionsv1alpha1 "github.com/alibaba/higress/client/pkg/applyconfiguration/extensions/v1alpha1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	labels "k8s.io/apimachinery/pkg/labels"
 	types "k8s.io/apimachinery/pkg/types"
@@ -77,6 +77,7 @@ func (c *FakeWasmPlugins) List(ctx context.Context, opts v1.ListOptions) (result
 func (c *FakeWasmPlugins) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(testing.NewWatchAction(wasmpluginsResource, c.ns, opts))
+
 }

 // Create takes the representation of a wasmPlugin and creates it.  Returns the server's representation of the wasmPlugin, and an error, if there is any.
--- a/client/pkg/clientset/versioned/typed/extensions/v1alpha1/wasmplugin.gen.go
+++ b/client/pkg/clientset/versioned/typed/extensions/v1alpha1/wasmplugin.gen.go
@@ -22,9 +22,9 @@ import (
 	"fmt"
 	"time"

-	v1alpha1 "github.com/alibaba/higress/v2/client/pkg/apis/extensions/v1alpha1"
-	extensionsv1alpha1 "github.com/alibaba/higress/v2/client/pkg/applyconfiguration/extensions/v1alpha1"
-	scheme "github.com/alibaba/higress/v2/client/pkg/clientset/versioned/scheme"
+	v1alpha1 "github.com/alibaba/higress/client/pkg/apis/extensions/v1alpha1"
+	extensionsv1alpha1 "github.com/alibaba/higress/client/pkg/applyconfiguration/extensions/v1alpha1"
+	scheme "github.com/alibaba/higress/client/pkg/clientset/versioned/scheme"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	types "k8s.io/apimachinery/pkg/types"
 	watch "k8s.io/apimachinery/pkg/watch"
--- a/client/pkg/clientset/versioned/typed/networking/v1/fake/fake_http2rpc.gen.go
+++ b/client/pkg/clientset/versioned/typed/networking/v1/fake/fake_http2rpc.gen.go
@@ -21,8 +21,8 @@ import (
 	json "encoding/json"
 	"fmt"

-	v1 "github.com/alibaba/higress/v2/client/pkg/apis/networking/v1"
-	networkingv1 "github.com/alibaba/higress/v2/client/pkg/applyconfiguration/networking/v1"
+	v1 "github.com/alibaba/higress/client/pkg/apis/networking/v1"
+	networkingv1 "github.com/alibaba/higress/client/pkg/applyconfiguration/networking/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	labels "k8s.io/apimachinery/pkg/labels"
 	types "k8s.io/apimachinery/pkg/types"
@@ -77,6 +77,7 @@ func (c *FakeHttp2Rpcs) List(ctx context.Context, opts metav1.ListOptions) (resu
 func (c *FakeHttp2Rpcs) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(testing.NewWatchAction(http2rpcsResource, c.ns, opts))
+
 }

 // Create takes the representation of a http2Rpc and creates it.  Returns the server's representation of the http2Rpc, and an error, if there is any.
--- a/client/pkg/clientset/versioned/typed/networking/v1/fake/fake_mcpbridge.gen.go
+++ b/client/pkg/clientset/versioned/typed/networking/v1/fake/fake_mcpbridge.gen.go
@@ -21,8 +21,8 @@ import (
 	json "encoding/json"
 	"fmt"

-	v1 "github.com/alibaba/higress/v2/client/pkg/apis/networking/v1"
-	networkingv1 "github.com/alibaba/higress/v2/client/pkg/applyconfiguration/networking/v1"
+	v1 "github.com/alibaba/higress/client/pkg/apis/networking/v1"
+	networkingv1 "github.com/alibaba/higress/client/pkg/applyconfiguration/networking/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	labels "k8s.io/apimachinery/pkg/labels"
 	types "k8s.io/apimachinery/pkg/types"
@@ -77,6 +77,7 @@ func (c *FakeMcpBridges) List(ctx context.Context, opts metav1.ListOptions) (res
 func (c *FakeMcpBridges) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(testing.NewWatchAction(mcpbridgesResource, c.ns, opts))
+
 }

 // Create takes the representation of a mcpBridge and creates it.  Returns the server's representation of the mcpBridge, and an error, if there is any.
--- a/client/pkg/clientset/versioned/typed/networking/v1/fake/fake_networking_client.gen.go
+++ b/client/pkg/clientset/versioned/typed/networking/v1/fake/fake_networking_client.gen.go
@@ -17,7 +17,7 @@
 package fake

 import (
-	v1 "github.com/alibaba/higress/v2/client/pkg/clientset/versioned/typed/networking/v1"
+	v1 "github.com/alibaba/higress/client/pkg/clientset/versioned/typed/networking/v1"
 	rest "k8s.io/client-go/rest"
 	testing "k8s.io/client-go/testing"
 )
--- a/client/pkg/clientset/versioned/typed/networking/v1/http2rpc.gen.go
+++ b/client/pkg/clientset/versioned/typed/networking/v1/http2rpc.gen.go
@@ -22,9 +22,9 @@ import (
 	"fmt"
 	"time"

-	v1 "github.com/alibaba/higress/v2/client/pkg/apis/networking/v1"
-	networkingv1 "github.com/alibaba/higress/v2/client/pkg/applyconfiguration/networking/v1"
-	scheme "github.com/alibaba/higress/v2/client/pkg/clientset/versioned/scheme"
+	v1 "github.com/alibaba/higress/client/pkg/apis/networking/v1"
+	networkingv1 "github.com/alibaba/higress/client/pkg/applyconfiguration/networking/v1"
+	scheme "github.com/alibaba/higress/client/pkg/clientset/versioned/scheme"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	types "k8s.io/apimachinery/pkg/types"
 	watch "k8s.io/apimachinery/pkg/watch"
--- a/client/pkg/clientset/versioned/typed/networking/v1/mcpbridge.gen.go
+++ b/client/pkg/clientset/versioned/typed/networking/v1/mcpbridge.gen.go
@@ -22,9 +22,9 @@ import (
 	"fmt"
 	"time"

-	v1 "github.com/alibaba/higress/v2/client/pkg/apis/networking/v1"
-	networkingv1 "github.com/alibaba/higress/v2/client/pkg/applyconfiguration/networking/v1"
-	scheme "github.com/alibaba/higress/v2/client/pkg/clientset/versioned/scheme"
+	v1 "github.com/alibaba/higress/client/pkg/apis/networking/v1"
+	networkingv1 "github.com/alibaba/higress/client/pkg/applyconfiguration/networking/v1"
+	scheme "github.com/alibaba/higress/client/pkg/clientset/versioned/scheme"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	types "k8s.io/apimachinery/pkg/types"
 	watch "k8s.io/apimachinery/pkg/watch"
--- a/client/pkg/clientset/versioned/typed/networking/v1/networking_client.gen.go
+++ b/client/pkg/clientset/versioned/typed/networking/v1/networking_client.gen.go
@@ -19,8 +19,8 @@ package v1
 import (
 	"net/http"

-	v1 "github.com/alibaba/higress/v2/client/pkg/apis/networking/v1"
-	"github.com/alibaba/higress/v2/client/pkg/clientset/versioned/scheme"
+	v1 "github.com/alibaba/higress/client/pkg/apis/networking/v1"
+	"github.com/alibaba/higress/client/pkg/clientset/versioned/scheme"
 	rest "k8s.io/client-go/rest"
 )

--- a/client/pkg/informers/externalversions/extensions/interface.gen.go
+++ b/client/pkg/informers/externalversions/extensions/interface.gen.go
@@ -17,8 +17,8 @@
 package extensions

 import (
-	v1alpha1 "github.com/alibaba/higress/v2/client/pkg/informers/externalversions/extensions/v1alpha1"
-	internalinterfaces "github.com/alibaba/higress/v2/client/pkg/informers/externalversions/internalinterfaces"
+	v1alpha1 "github.com/alibaba/higress/client/pkg/informers/externalversions/extensions/v1alpha1"
+	internalinterfaces "github.com/alibaba/higress/client/pkg/informers/externalversions/internalinterfaces"
 )

 // Interface provides access to each of this group's versions.
--- a/client/pkg/informers/externalversions/extensions/v1alpha1/interface.gen.go
+++ b/client/pkg/informers/externalversions/extensions/v1alpha1/interface.gen.go
@@ -17,7 +17,7 @@
 package v1alpha1

 import (
-	internalinterfaces "github.com/alibaba/higress/v2/client/pkg/informers/externalversions/internalinterfaces"
+	internalinterfaces "github.com/alibaba/higress/client/pkg/informers/externalversions/internalinterfaces"
 )

 // Interface provides access to all the informers in this group version.
--- a/client/pkg/informers/externalversions/extensions/v1alpha1/wasmplugin.gen.go
+++ b/client/pkg/informers/externalversions/extensions/v1alpha1/wasmplugin.gen.go
@@ -20,10 +20,10 @@ import (
 	"context"
 	time "time"

-	extensionsv1alpha1 "github.com/alibaba/higress/v2/client/pkg/apis/extensions/v1alpha1"
-	versioned "github.com/alibaba/higress/v2/client/pkg/clientset/versioned"
-	internalinterfaces "github.com/alibaba/higress/v2/client/pkg/informers/externalversions/internalinterfaces"
-	v1alpha1 "github.com/alibaba/higress/v2/client/pkg/listers/extensions/v1alpha1"
+	extensionsv1alpha1 "github.com/alibaba/higress/client/pkg/apis/extensions/v1alpha1"
+	versioned "github.com/alibaba/higress/client/pkg/clientset/versioned"
+	internalinterfaces "github.com/alibaba/higress/client/pkg/informers/externalversions/internalinterfaces"
+	v1alpha1 "github.com/alibaba/higress/client/pkg/listers/extensions/v1alpha1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
--- a/client/pkg/informers/externalversions/factory.gen.go
+++ b/client/pkg/informers/externalversions/factory.gen.go
@@ -21,10 +21,10 @@ import (
 	sync "sync"
 	time "time"

-	versioned "github.com/alibaba/higress/v2/client/pkg/clientset/versioned"
-	extensions "github.com/alibaba/higress/v2/client/pkg/informers/externalversions/extensions"
-	internalinterfaces "github.com/alibaba/higress/v2/client/pkg/informers/externalversions/internalinterfaces"
-	networking "github.com/alibaba/higress/v2/client/pkg/informers/externalversions/networking"
+	versioned "github.com/alibaba/higress/client/pkg/clientset/versioned"
+	extensions "github.com/alibaba/higress/client/pkg/informers/externalversions/extensions"
+	internalinterfaces "github.com/alibaba/higress/client/pkg/informers/externalversions/internalinterfaces"
+	networking "github.com/alibaba/higress/client/pkg/informers/externalversions/networking"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
--- a/client/pkg/informers/externalversions/generic.gen.go
+++ b/client/pkg/informers/externalversions/generic.gen.go
@@ -19,8 +19,8 @@ package externalversions
 import (
 	"fmt"

-	v1alpha1 "github.com/alibaba/higress/v2/client/pkg/apis/extensions/v1alpha1"
-	v1 "github.com/alibaba/higress/v2/client/pkg/apis/networking/v1"
+	v1alpha1 "github.com/alibaba/higress/client/pkg/apis/extensions/v1alpha1"
+	v1 "github.com/alibaba/higress/client/pkg/apis/networking/v1"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
 	cache "k8s.io/client-go/tools/cache"
 )
--- a/client/pkg/informers/externalversions/internalinterfaces/factory_interfaces.gen.go
+++ b/client/pkg/informers/externalversions/internalinterfaces/factory_interfaces.gen.go
@@ -19,7 +19,7 @@ package internalinterfaces
 import (
 	time "time"

-	versioned "github.com/alibaba/higress/v2/client/pkg/clientset/versioned"
+	versioned "github.com/alibaba/higress/client/pkg/clientset/versioned"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	cache "k8s.io/client-go/tools/cache"
--- a/client/pkg/informers/externalversions/networking/interface.gen.go
+++ b/client/pkg/informers/externalversions/networking/interface.gen.go
@@ -17,8 +17,8 @@
 package networking

 import (
-	internalinterfaces "github.com/alibaba/higress/v2/client/pkg/informers/externalversions/internalinterfaces"
-	v1 "github.com/alibaba/higress/v2/client/pkg/informers/externalversions/networking/v1"
+	internalinterfaces "github.com/alibaba/higress/client/pkg/informers/externalversions/internalinterfaces"
+	v1 "github.com/alibaba/higress/client/pkg/informers/externalversions/networking/v1"
 )

 // Interface provides access to each of this group's versions.
--- a/client/pkg/informers/externalversions/networking/v1/http2rpc.gen.go
+++ b/client/pkg/informers/externalversions/networking/v1/http2rpc.gen.go
@@ -20,10 +20,10 @@ import (
 	"context"
 	time "time"

-	networkingv1 "github.com/alibaba/higress/v2/client/pkg/apis/networking/v1"
-	versioned "github.com/alibaba/higress/v2/client/pkg/clientset/versioned"
-	internalinterfaces "github.com/alibaba/higress/v2/client/pkg/informers/externalversions/internalinterfaces"
-	v1 "github.com/alibaba/higress/v2/client/pkg/listers/networking/v1"
+	networkingv1 "github.com/alibaba/higress/client/pkg/apis/networking/v1"
+	versioned "github.com/alibaba/higress/client/pkg/clientset/versioned"
+	internalinterfaces "github.com/alibaba/higress/client/pkg/informers/externalversions/internalinterfaces"
+	v1 "github.com/alibaba/higress/client/pkg/listers/networking/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
--- a/client/pkg/informers/externalversions/networking/v1/interface.gen.go
+++ b/client/pkg/informers/externalversions/networking/v1/interface.gen.go
@@ -17,7 +17,7 @@
 package v1

 import (
-	internalinterfaces "github.com/alibaba/higress/v2/client/pkg/informers/externalversions/internalinterfaces"
+	internalinterfaces "github.com/alibaba/higress/client/pkg/informers/externalversions/internalinterfaces"
 )

 // Interface provides access to all the informers in this group version.
--- a/client/pkg/informers/externalversions/networking/v1/mcpbridge.gen.go
+++ b/client/pkg/informers/externalversions/networking/v1/mcpbridge.gen.go
@@ -20,10 +20,10 @@ import (
 	"context"
 	time "time"

-	networkingv1 "github.com/alibaba/higress/v2/client/pkg/apis/networking/v1"
-	versioned "github.com/alibaba/higress/v2/client/pkg/clientset/versioned"
-	internalinterfaces "github.com/alibaba/higress/v2/client/pkg/informers/externalversions/internalinterfaces"
-	v1 "github.com/alibaba/higress/v2/client/pkg/listers/networking/v1"
+	networkingv1 "github.com/alibaba/higress/client/pkg/apis/networking/v1"
+	versioned "github.com/alibaba/higress/client/pkg/clientset/versioned"
+	internalinterfaces "github.com/alibaba/higress/client/pkg/informers/externalversions/internalinterfaces"
+	v1 "github.com/alibaba/higress/client/pkg/listers/networking/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
--- a/client/pkg/listers/extensions/v1alpha1/wasmplugin.gen.go
+++ b/client/pkg/listers/extensions/v1alpha1/wasmplugin.gen.go
@@ -17,7 +17,7 @@
 package v1alpha1

 import (
-	v1alpha1 "github.com/alibaba/higress/v2/client/pkg/apis/extensions/v1alpha1"
+	v1alpha1 "github.com/alibaba/higress/client/pkg/apis/extensions/v1alpha1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"
--- a/client/pkg/listers/networking/v1/http2rpc.gen.go
+++ b/client/pkg/listers/networking/v1/http2rpc.gen.go
@@ -17,7 +17,7 @@
 package v1

 import (
-	v1 "github.com/alibaba/higress/v2/client/pkg/apis/networking/v1"
+	v1 "github.com/alibaba/higress/client/pkg/apis/networking/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"
--- a/client/pkg/listers/networking/v1/mcpbridge.gen.go
+++ b/client/pkg/listers/networking/v1/mcpbridge.gen.go
@@ -17,7 +17,7 @@
 package v1

 import (
-	v1 "github.com/alibaba/higress/v2/client/pkg/apis/networking/v1"
+	v1 "github.com/alibaba/higress/client/pkg/apis/networking/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"
--- a/cmd/higress/main.go
+++ b/cmd/higress/main.go
@@ -20,7 +20,7 @@ import (

 	"istio.io/pkg/log"

-	"github.com/alibaba/higress/v2/pkg/cmd"
+	"github.com/alibaba/higress/pkg/cmd"
 )

 func main() {
--- a/docker/Dockerfile.higress
+++ b/docker/Dockerfile.higress
@@ -6,14 +6,13 @@ ARG BASE_VERSION=latest

 ARG HUB

-ARG TARGETARCH
-
 # The following section is used as base image if BASE_DISTRIBUTION=debug
 # This base image is provided by istio, see: https://github.com/istio/istio/blob/master/docker/Dockerfile.base
-FROM ${HUB}/base:${BASE_VERSION}-${TARGETARCH}
+FROM ${HUB}/base:${BASE_VERSION}

 ARG TARGETARCH
-COPY ${TARGETARCH}/higress /usr/local/bin/higress
+
+COPY ${TARGETARCH:-amd64}/higress /usr/local/bin/higress

 USER 1337:1337

--- a/docker/docker.mk
+++ b/docker/docker.mk
@@ -17,11 +17,6 @@ docker.higress: $(OUT_LINUX)/higress
 docker.higress: docker/Dockerfile.higress
 	$(HIGRESS_DOCKER_RULE)

-docker.higress-amd64: BUILD_ARGS=--build-arg BASE_VERSION=${HIGRESS_BASE_VERSION} --build-arg HUB=${HUB}
-docker.higress-amd64: $(AMD64_OUT_LINUX)/higress
-docker.higress-amd64: docker/Dockerfile.higress
-	$(HIGRESS_DOCKER_AMD64_RULE)
-
 docker.higress-buildx: BUILD_ARGS=--build-arg BASE_VERSION=${HIGRESS_BASE_VERSION} --build-arg HUB=${HUB}
 docker.higress-buildx: $(AMD64_OUT_LINUX)/higress
 docker.higress-buildx: $(ARM64_OUT_LINUX)/higress
@@ -45,4 +40,3 @@ IMG_URL ?= $(HUB)/$(IMG):$(TAG)

 HIGRESS_DOCKER_BUILDX_RULE ?= $(foreach VARIANT,$(DOCKER_BUILD_VARIANTS), time (mkdir -p $(HIGRESS_DOCKER_BUILD_TOP)/$@ && TARGET_ARCH=$(TARGET_ARCH) ./docker/docker-copy.sh $^ $(HIGRESS_DOCKER_BUILD_TOP)/$@ && cd $(HIGRESS_DOCKER_BUILD_TOP)/$@ $(BUILD_PRE) && docker buildx create --name higress --node higress0 --platform linux/amd64,linux/arm64 --use && docker buildx build --no-cache --platform linux/amd64,linux/arm64 $(BUILD_ARGS) --build-arg BASE_DISTRIBUTION=$(call normalize-tag,$(VARIANT)) -t $(IMG_URL)$(call variant-tag,$(VARIANT)) -f Dockerfile.higress . --push  ); )
 HIGRESS_DOCKER_RULE ?= $(foreach VARIANT,$(DOCKER_BUILD_VARIANTS), time (mkdir -p $(HIGRESS_DOCKER_BUILD_TOP)/$@ && TARGET_ARCH=$(TARGET_ARCH) ./docker/docker-copy.sh $^ $(HIGRESS_DOCKER_BUILD_TOP)/$@ && cd $(HIGRESS_DOCKER_BUILD_TOP)/$@ $(BUILD_PRE) && docker build $(BUILD_ARGS) --build-arg BASE_DISTRIBUTION=$(call normalize-tag,$(VARIANT)) -t $(IMG_URL)$(call variant-tag,$(VARIANT)) -f Dockerfile.higress . ); )
-HIGRESS_DOCKER_AMD64_RULE ?= $(foreach VARIANT,$(DOCKER_BUILD_VARIANTS), time (mkdir -p $(HIGRESS_DOCKER_BUILD_TOP)/$@ && TARGET_ARCH=amd64 ./docker/docker-copy.sh $^ $(HIGRESS_DOCKER_BUILD_TOP)/$@ && cd $(HIGRESS_DOCKER_BUILD_TOP)/$@ $(BUILD_PRE) && docker build $(BUILD_ARGS) --build-arg BASE_DISTRIBUTION=$(call normalize-tag,$(VARIANT)) --build-arg TARGETARCH=amd64 -t $(IMG_URL)$(call variant-tag,$(VARIANT)) -f Dockerfile.higress . ); )
--- a/envoy/envoy
+++ b/envoy/envoy
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module github.com/alibaba/higress/v2
+module github.com/alibaba/higress

 go 1.22.2

@@ -31,7 +31,7 @@ require (
 	github.com/hudl/fargo v1.4.0
 	github.com/mholt/acmez v1.2.0
 	github.com/nacos-group/nacos-sdk-go v1.0.8
-	github.com/nacos-group/nacos-sdk-go/v2 v2.3.2
+	github.com/nacos-group/nacos-sdk-go/v2 v2.1.2
 	github.com/onsi/gomega v1.27.10
 	github.com/spf13/cobra v1.8.0
 	github.com/spf13/pflag v1.0.5
@@ -202,7 +202,6 @@ require (
 	github.com/spaolacci/murmur3 v1.1.0 // indirect
 	github.com/spf13/cast v1.5.1 // indirect
 	github.com/stoewer/go-strcase v1.3.0 // indirect
-	github.com/stretchr/objx v0.5.0 // indirect
 	github.com/tetratelabs/wazero v1.7.3 // indirect
 	github.com/tidwall/match v1.1.1 // indirect
 	github.com/tidwall/pretty v1.2.0 // indirect
@@ -275,5 +274,6 @@ replace github.com/caddyserver/certmagic => github.com/2456868764/certmagic v1.0

 replace (
 	github.com/dubbogo/gost => github.com/johnlanni/gost v1.11.23-0.20220713132522-0967a24036c6
+	github.com/nacos-group/nacos-sdk-go/v2 => github.com/luoxiner/nacos-sdk-go/v2 v2.2.9-60
 	golang.org/x/exp => golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1
 )
--- a/go.sum
+++ b/go.sum
@@ -1434,6 +1434,8 @@ github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de h1:9TO3cAIGXtEhn
 github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod h1:zAbeS9B/r2mtpb6U+EI2rYA5OAXxsYw6wTamcNW+zcE=
 github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM=
 github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4=
+github.com/luoxiner/nacos-sdk-go/v2 v2.2.9-60 h1:FA/azfz2nSkMc1XR8LeqhcAiA/2/sOMcyBGYCTUc+Cs=
+github.com/luoxiner/nacos-sdk-go/v2 v2.2.9-60/go.mod h1:9FKXl6FqOiVmm72i8kADtbeK71egyG9y3uRDBg41tpQ=
 github.com/lyft/protoc-gen-star v0.6.1/go.mod h1:TGAoBVkt8w7MPG72TrKIu85MIdXwDuzJYeZuUPFPNwA=
 github.com/lyft/protoc-gen-star/v2 v2.0.1/go.mod h1:RcCdONR2ScXaYnQC5tUzxzlpA3WVYF7/opLeUgcQs/o=
 github.com/lyft/protoc-gen-star/v2 v2.0.3/go.mod h1:amey7yeodaJhXSbf/TlLvWiqQfLOSpEk//mLlc+axEk=
@@ -1523,8 +1525,6 @@ github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRW
 github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
 github.com/nacos-group/nacos-sdk-go v1.0.8 h1:8pEm05Cdav9sQgJSv5kyvlgfz0SzFUUGI3pWX6SiSnM=
 github.com/nacos-group/nacos-sdk-go v1.0.8/go.mod h1:hlAPn3UdzlxIlSILAyOXKxjFSvDJ9oLzTJ9hLAK1KzA=
-github.com/nacos-group/nacos-sdk-go/v2 v2.3.2 h1:9QB2nCJzT5wkTVlxNYl3XL/7+G6p2USMi2gQh/ouQQo=
-github.com/nacos-group/nacos-sdk-go/v2 v2.3.2/go.mod h1:9FKXl6FqOiVmm72i8kADtbeK71egyG9y3uRDBg41tpQ=
 github.com/nats-io/jwt v0.3.0/go.mod h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5VglpSg=
 github.com/nats-io/jwt v0.3.2/go.mod h1:/euKqTS1ZD+zzjYrY7pseZrTtWQSjujC7xjPc8wL6eU=
 github.com/nats-io/nats-server/v2 v2.1.2/go.mod h1:Afk+wRZqkMQs/p45uXdrVLuab3gwv3Z8C4HTBu8GD/k=
--- a/helm/core/Chart.yaml
+++ b/helm/core/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 2.1.9-rc.1
+appVersion: 2.1.3
 description: Helm chart for deploying higress gateways
 icon: https://higress.io/img/higress_logo_small.png
 home: http://higress.io/
@@ -15,4 +15,4 @@ dependencies:
    repository: "file://../redis"
    version: 0.0.1
 type: application
-version: 2.1.9-rc.1
+version: 2.1.3
--- a/helm/core/README.md
+++ b/helm/core/README.md
@@ -1,5 +1,5 @@
-# Higress Core Helm Chart
-
-Installs the core components of cloud-native gateway [Higress](http://higress.io/)
-
-**Note:** It is highly recommended to install the whole package of Higress. Please visit https://higress.io/docs/user/quickstart/ for details.
+# Higress Core Helm Chart
+
+Installs the core components of cloud-native gateway [Higress](http://higress.io/)
+
+**Note:** It is highly recommended to install the whole package of Higress. Please visit https://higress.io/docs/user/quickstart/ for details.
--- a/helm/core/crds/customresourcedefinitions.gen.yaml
+++ b/helm/core/crds/customresourcedefinitions.gen.yaml
@@ -247,30 +247,9 @@ spec:
        properties:
          spec:
            properties:
-              proxies:
-                items:
-                  properties:
-                    connectTimeout:
-                      type: integer
-                    listenerPort:
-                      type: integer
-                    name:
-                      type: string
-                    serverAddress:
-                      type: string
-                    serverPort:
-                      type: integer
-                    type:
-                      type: string
-                  type: object
-                type: array
              registries:
                items:
                  properties:
-                    allowMcpServers:
-                      items:
-                        type: string
-                      type: array
                    authSecretName:
                      type: string
                    consulDatacenter:
@@ -284,25 +263,6 @@ spec:
                      type: string
                    domain:
                      type: string
-                    enableMCPServer:
-                      type: boolean
-                    enableScopeMcpServers:
-                      type: boolean
-                    mcpServerBaseUrl:
-                      type: string
-                    mcpServerExportDomains:
-                      items:
-                        type: string
-                      type: array
-                    metadata:
-                      additionalProperties:
-                        properties:
-                          innerMap:
-                            additionalProperties:
-                              type: string
-                            type: object
-                        type: object
-                      type: object
                    nacosAccessKey:
                      type: string
                    nacosAddressServer:
@@ -326,26 +286,10 @@ spec:
                      type: integer
                    protocol:
                      type: string
-                    proxyName:
-                      type: string
                    sni:
                      type: string
                    type:
                      type: string
-                    vport:
-                      properties:
-                        default:
-                          type: integer
-                        services:
-                          items:
-                            properties:
-                              name:
-                                type: string
-                              value:
-                                type: integer
-                            type: object
-                          type: array
-                      type: object
                    zkServicesPath:
                      items:
                        type: string
--- a/helm/core/templates/_helpers.tpl
+++ b/helm/core/templates/_helpers.tpl
@@ -113,36 +113,3 @@ kind: VMPodScrape
 {{- fail "unexpected gateway.metrics.provider" -}}
 {{- end -}}
 {{- end -}}
-
-{{- define "pluginServer.name" -}}
-{{- .Values.pluginServer.name | default "higress-plugin-server" -}}
-{{- end }}
-
-{{- define "pluginServer.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
-{{- end }}
-
-{{- define "pluginServer.labels" -}}
-helm.sh/chart: {{ include "pluginServer.chart" . }}
-{{ include "pluginServer.selectorLabels" . }}
-{{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-{{- end }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
-app.kubernetes.io/name: {{ include "pluginServer.name" . }}
-{{- end }}
-
-{{- define "pluginServer.selectorLabels" -}}
-{{- if hasKey .Values.pluginServer.labels "app" }}
-{{- with .Values.pluginServer.labels.app }}app: {{.|quote}}
-{{- end}}
-{{- else }}app: {{ include "pluginServer.name" . }}
-{{- end }}
-{{- if hasKey .Values.pluginServer.labels "higress" }}
-{{- with .Values.pluginServer.labels.higress }}
-higress: {{.|quote}}
-{{- end}}
-{{- else }}
-higress: {{ include "pluginServer.name" . }}
-{{- end }}
-{{- end }}
--- a/helm/core/templates/configmap.yaml
+++ b/helm/core/templates/configmap.yaml
@@ -9,7 +9,9 @@
    accessLogFile: "/dev/stdout"
    {{- end }}
    ingressControllerMode: "OFF"
-    accessLogFormat: '{"ai_log":"%FILTER_STATE(wasm.ai_log:PLAIN)%","authority":"%REQ(X-ENVOY-ORIGINAL-HOST?:AUTHORITY)%","bytes_received":"%BYTES_RECEIVED%","bytes_sent":"%BYTES_SENT%","downstream_local_address":"%DOWNSTREAM_LOCAL_ADDRESS%","downstream_remote_address":"%DOWNSTREAM_REMOTE_ADDRESS%","duration":"%DURATION%","istio_policy_status":"%DYNAMIC_METADATA(istio.mixer:status)%","method":"%REQ(:METHOD)%","path":"%REQ(X-ENVOY-ORIGINAL-PATH?:PATH)%","protocol":"%PROTOCOL%","request_id":"%REQ(X-REQUEST-ID)%","requested_server_name":"%REQUESTED_SERVER_NAME%","response_code":"%RESPONSE_CODE%","response_flags":"%RESPONSE_FLAGS%","route_name":"%ROUTE_NAME%","start_time":"%START_TIME%","trace_id":"%REQ(X-B3-TRACEID)%","upstream_cluster":"%UPSTREAM_CLUSTER%","upstream_host":"%UPSTREAM_HOST%","upstream_local_address":"%UPSTREAM_LOCAL_ADDRESS%","upstream_service_time":"%RESP(X-ENVOY-UPSTREAM-SERVICE-TIME)%","upstream_transport_failure_reason":"%UPSTREAM_TRANSPORT_FAILURE_REASON%","user_agent":"%REQ(USER-AGENT)%","x_forwarded_for":"%REQ(X-FORWARDED-FOR)%","response_code_details":"%RESPONSE_CODE_DETAILS%"}'
+    accessLogFormat: '{"ai_log":"%FILTER_STATE(wasm.ai_log:PLAIN)%","authority":"%REQ(X-ENVOY-ORIGINAL-HOST?:AUTHORITY)%","bytes_received":"%BYTES_RECEIVED%","bytes_sent":"%BYTES_SENT%","downstream_local_address":"%DOWNSTREAM_LOCAL_ADDRESS%","downstream_remote_address":"%DOWNSTREAM_REMOTE_ADDRESS%","duration":"%DURATION%","istio_policy_status":"%DYNAMIC_METADATA(istio.mixer:status)%","method":"%REQ(:METHOD)%","path":"%REQ(X-ENVOY-ORIGINAL-PATH?:PATH)%","protocol":"%PROTOCOL%","request_id":"%REQ(X-REQUEST-ID)%","requested_server_name":"%REQUESTED_SERVER_NAME%","response_code":"%RESPONSE_CODE%","response_flags":"%RESPONSE_FLAGS%","route_name":"%ROUTE_NAME%","start_time":"%START_TIME%","trace_id":"%REQ(X-B3-TRACEID)%","upstream_cluster":"%UPSTREAM_CLUSTER%","upstream_host":"%UPSTREAM_HOST%","upstream_local_address":"%UPSTREAM_LOCAL_ADDRESS%","upstream_service_time":"%RESP(X-ENVOY-UPSTREAM-SERVICE-TIME)%","upstream_transport_failure_reason":"%UPSTREAM_TRANSPORT_FAILURE_REASON%","user_agent":"%REQ(USER-AGENT)%","x_forwarded_for":"%REQ(X-FORWARDED-FOR)%","response_code_details":"%RESPONSE_CODE_DETAILS%"}
+
+    '
    dnsRefreshRate: 200s
    enableAutoMtls: false
    enablePrometheusMerge: false
@@ -97,7 +99,7 @@ metadata:
  name: higress-config
  namespace: {{ .Release.Namespace }}
  labels:
-    {{- include "gateway.labels" . | nindent 4 }}
+    {{- include "gateway.labels" . | nindent 4 }}    
 data:
  higress: |-
    {{- $existingConfig := lookup "v1" "ConfigMap" .Release.Namespace "higress-config" }}
@@ -112,9 +114,6 @@ data:
    {{- if hasKey .Values "downstream" }}
    {{- $_ := set $newData "downstream" .Values.downstream }}
    {{- end }}
-    {{- if hasKey .Values "gzip" }}
-    {{- $_ := set $newData "gzip" .Values.gzip }}
-    {{- end }}
    {{- if and (hasKey .Values "tracing") .Values.tracing.enable }}
    {{- $_ := set $newData "tracing" .Values.tracing }}
    {{- end }}
@@ -127,7 +126,7 @@ data:
  {{- else }}
    networks: {}
  {{- end }}
-
+  
  mesh: |-
 {{- if .Values.meshConfig }}
 {{ $mesh | toYaml | indent 4 }}
--- a/helm/core/templates/controller-serviceaccont.yaml
+++ b/helm/core/templates/controller-serviceaccont.yaml
@@ -6,8 +6,4 @@ metadata:
  namespace: {{ .Release.Namespace }}
  labels:
    {{- include "controller.labels" . | nindent 4 }}
-  {{- with .Values.controller.serviceAccount.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
 {{- end }}
--- a/helm/core/templates/fallback-envoyfilter.yaml
+++ b/helm/core/templates/fallback-envoyfilter.yaml
@@ -19,7 +19,4 @@ spec:
        value:
          name: envoy.filters.http.custom_response
          typed_config:
-            "@type": type.googleapis.com/envoy.extensions.filters.http.custom_response.v3.CustomResponse
-  workloadSelector:
-    labels:
-      {{- include "gateway.selectorLabels" . | nindent 6 }}
+            "@type": type.googleapis.com/envoy.extensions.filters.http.custom_response.v3.CustomResponse
--- a/helm/core/templates/plugin-server-deployment.yaml
+++ b/helm/core/templates/plugin-server-deployment.yaml
@@ -1,39 +0,0 @@
-{{- if .Values.global.enablePluginServer }}
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ include "pluginServer.name" . }}
-  namespace: {{ .Release.Namespace }}
-spec:
-  replicas: {{ .Values.pluginServer.replicas }}
-  selector:
-    matchLabels:
-      {{- include "pluginServer.selectorLabels" . | nindent 6 }}
-  template:
-    metadata:
-      labels:
-        {{- with .Values.pluginServer.podLabels }}
-        {{- toYaml . | nindent 8 }}
-        {{- end }}
-        {{- include "pluginServer.selectorLabels" . | nindent 8 }}
-    spec:
-      {{- with .Values.pluginServer.imagePullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      containers:
-        - name: {{ .Chart.Name }}
-          image: {{ .Values.pluginServer.hub | default .Values.global.hub }}/{{ .Values.pluginServer.image | default "plugin-server" }}:{{ .Values.pluginServer.tag | default "1.0.0" }}
-          {{- if .Values.global.imagePullPolicy }}
-          imagePullPolicy: {{ .Values.global.imagePullPolicy }}
-          {{- end }}
-          ports:
-            - containerPort: 8080
-          resources:
-            requests:
-              cpu: {{ .Values.pluginServer.resources.requests.cpu }}
-              memory: {{ .Values.pluginServer.resources.requests.memory }}
-            limits:
-              cpu: {{ .Values.pluginServer.resources.limits.cpu }}
-              memory: {{ .Values.pluginServer.resources.limits.memory }}
-{{- end }}
--- a/helm/core/templates/plugin-server-service.yaml
+++ b/helm/core/templates/plugin-server-service.yaml
@@ -1,16 +0,0 @@
-{{- if .Values.global.enablePluginServer }}
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "pluginServer.name" . }}
-  namespace: {{ .Release.Namespace }}
-  labels:
-    {{- include "pluginServer.labels" . | nindent 4 }}
-spec:
-  ports:
-    - protocol: TCP
-      port: {{ .Values.pluginServer.service.port }}
-      targetPort: 8080
-  selector:
-    {{- include "pluginServer.selectorLabels" . | nindent 4 }}
-{{- end }}
--- a/helm/core/values.yaml
+++ b/helm/core/values.yaml
@@ -11,7 +11,6 @@ global:
  enableSRDS: true
  # -- Whether to enable Redis(redis-stack-server) for Higress, default is false.
  enableRedis: false
-  enablePluginServer: false
  onDemandRDS: false
  hostRDSMergeSubset: false
  onlyPushRouteCluster: true
@@ -581,7 +580,8 @@ controller:
  # -- Labels to apply to the pod
  podLabels: {}

-  podSecurityContext: {}
+  podSecurityContext:
+    {}
  # fsGroup: 2000

  ports:
@@ -708,13 +708,13 @@ tracing:
  enable: false
  sampling: 100
  timeout: 500
-  # skywalking:
-  #   access_token: ""
-  #   service: ""
-  #   port: 11800
+  skywalking:
+    # access_token: ""
+    service: ""
+    port: 11800
  # zipkin:
-  #   service: ""
-  #   port: 9411
+  # service: ""
+  # port: 9411

 # -- Downstream config settings
 downstream:
@@ -732,26 +732,6 @@ upstream:
  idleTimeout: 10
  connectionBufferLimits: 10485760

-# -- Gzip compression settings
-gzip:
-  enable: true
-  minContentLength: 1024
-  contentType:
-    - "text/html"
-    - "text/css"
-    - "text/plain"
-    - "text/xml"
-    - "application/json"
-    - "application/javascript"
-    - "application/xhtml+xml"
-    - "image/svg+xml"
-  disableOnEtagHeader: true
-  memoryLevel: 5
-  windowBits: 12
-  chunkSize: 4096
-  compressionLevel: "BEST_COMPRESSION"
-  compressionStrategy: "DEFAULT_STRATEGY"
-
 redis:
  redis:
    name: redis-stack-server
@@ -787,31 +767,4 @@ redis:
      accessModes:
        - ReadWriteOnce
      # -- Persistent Volume size
-      size: 1Gi
-
-pluginServer:
-  name: "higress-plugin-server"
-  # -- Number of Higress Plugin Server pods, 2 recommended for high availability
-  replicas: 2
-  image: plugin-server
-
-  hub: higress-registry.cn-hangzhou.cr.aliyuncs.com/higress
-  tag: ""
-
-  imagePullSecrets: []
-
-  labels: {}
-  # -- Labels to apply to the pod
-  podLabels: {}
-
-  #  Plugin-server Service configuration
-  service:
-    port: 80 # Container target port (usually fixed)
-
-  resources:
-    requests:
-      cpu: 200m
-      memory: 128Mi
-    limits:
-      cpu: 500m
-      memory: 256Mi
+      size: 1Gi
--- a/helm/higress/Chart.lock
+++ b/helm/higress/Chart.lock
@@ -1,9 +1,9 @@
 dependencies:
 - name: higress-core
  repository: file://../core
-  version: 2.1.9-rc.1
+  version: 2.1.3
 - name: higress-console
  repository: https://higress.io/helm-charts/
-  version: 2.1.8
-digest: sha256:0899e57f8744790bef3061413d6ce43ca4a54ac21fbe44fc0af7db973da28a79
-generated: "2025-10-09T17:25:21.377573+08:00"
+  version: 2.1.3
+digest: sha256:c7307d5398c3c1178758c5372bd1aa4cb8dee7beeab3832d3e9ce0a04d1adc23
+generated: "2025-05-09T15:29:50.616179+08:00"
--- a/helm/higress/Chart.yaml
+++ b/helm/higress/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 2.1.9-rc.1
+appVersion: 2.1.3
 description: Helm chart for deploying Higress gateways
 icon: https://higress.io/img/higress_logo_small.png
 home: http://higress.io/
@@ -12,9 +12,9 @@ sources:
 dependencies:
 - name: higress-core
  repository: "file://../core"
-  version: 2.1.9-rc.1
+  version: 2.1.3
 - name: higress-console
  repository: "https://higress.io/helm-charts/"
-  version: 2.1.8
+  version: 2.1.3
 type: application
-version: 2.1.9-rc.1
+version: 2.1.3
--- a/helm/higress/README.md
+++ b/helm/higress/README.md
@@ -165,7 +165,6 @@ The command removes all the Kubernetes components associated with the chart and
 | global.enableIPv6 | bool | `false` |  |
 | global.enableIstioAPI | bool | `true` | If true, Higress Controller will monitor istio resources as well |
 | global.enableLDSCache | bool | `false` |  |
-| global.enablePluginServer | bool | `false` |  |
 | global.enableProxyProtocol | bool | `false` |  |
 | global.enablePushAllMCPClusters | bool | `true` |  |
 | global.enableRedis | bool | `false` | Whether to enable Redis(redis-stack-server) for Higress, default is false. |
@@ -242,7 +241,6 @@ The command removes all the Kubernetes components associated with the chart and
 | global.useMCP | bool | `false` | Use the Mesh Control Protocol (MCP) for configuring Istiod. Requires an MCP source. |
 | global.watchNamespace | string | `""` | If not empty, Higress Controller will only watch resources in the specified namespace. When isolating different business systems using K8s namespace, if each namespace requires a standalone gateway instance, this parameter can be used to confine the Ingress watching of Higress within the given namespace. |
 | global.xdsMaxRecvMsgSize | string | `"104857600"` |  |
-| gzip | object | `{"chunkSize":4096,"compressionLevel":"BEST_COMPRESSION","compressionStrategy":"DEFAULT_STRATEGY","contentType":["text/html","text/css","text/plain","text/xml","application/json","application/javascript","application/xhtml+xml","image/svg+xml"],"disableOnEtagHeader":true,"enable":true,"memoryLevel":5,"minContentLength":1024,"windowBits":12}` | Gzip compression settings |
 | hub | string | `"higress-registry.cn-hangzhou.cr.aliyuncs.com/higress"` |  |
 | meshConfig | object | `{"enablePrometheusMerge":true,"rootNamespace":null,"trustDomain":"cluster.local"}` | meshConfig defines runtime configuration of components, including Istiod and istio-agent behavior See https://istio.io/docs/reference/config/istio.mesh.v1alpha1/ for all available options |
 | meshConfig.rootNamespace | string | `nil` | The namespace to treat as the administrative root namespace for Istio configuration. When processing a leaf namespace Istio will search for declarations in that namespace first and if none are found it will search in the root namespace. Any matching declaration found in the root namespace is processed as if it were declared in the leaf namespace. |
@@ -275,19 +273,6 @@ The command removes all the Kubernetes components associated with the chart and
 | pilot.serviceAnnotations | object | `{}` |  |
 | pilot.tag | string | `""` |  |
 | pilot.traceSampling | float | `1` |  |
-| pluginServer.hub | string | `"higress-registry.cn-hangzhou.cr.aliyuncs.com/higress"` |  |
-| pluginServer.image | string | `"plugin-server"` |  |
-| pluginServer.imagePullSecrets | list | `[]` |  |
-| pluginServer.labels | object | `{}` |  |
-| pluginServer.name | string | `"higress-plugin-server"` |  |
-| pluginServer.podLabels | object | `{}` | Labels to apply to the pod |
-| pluginServer.replicas | int | `2` | Number of Higress Plugin Server pods, 2 recommended for high availability |
-| pluginServer.resources.limits.cpu | string | `"500m"` |  |
-| pluginServer.resources.limits.memory | string | `"256Mi"` |  |
-| pluginServer.resources.requests.cpu | string | `"200m"` |  |
-| pluginServer.resources.requests.memory | string | `"128Mi"` |  |
-| pluginServer.service.port | int | `80` |  |
-| pluginServer.tag | string | `""` |  |
 | redis.redis.affinity | object | `{}` | Affinity for Redis |
 | redis.redis.image | string | `"redis-stack-server"` | Specify the image |
 | redis.redis.name | string | `"redis-stack-server"` |  |
@@ -307,5 +292,7 @@ The command removes all the Kubernetes components associated with the chart and
 | revision | string | `""` |  |
 | tracing.enable | bool | `false` |  |
 | tracing.sampling | int | `100` |  |
+| tracing.skywalking.port | int | `11800` |  |
+| tracing.skywalking.service | string | `""` |  |
 | tracing.timeout | int | `500` |  |
 | upstream | object | `{"connectionBufferLimits":10485760,"idleTimeout":10}` | Upstream config settings |
--- a/hgctl/cmd/hgctl/config/gateway_config.go
+++ b/hgctl/cmd/hgctl/config/gateway_config.go
@@ -27,7 +27,7 @@ import (
 	"sigs.k8s.io/yaml"

 	"github.com/alibaba/higress/hgctl/pkg/kubernetes"
-	"github.com/alibaba/higress/v2/pkg/cmd/options"
+	"github.com/alibaba/higress/pkg/cmd/options"
 )

 var (
--- a/hgctl/cmd/hgctl/config/gateway_config_test.go
+++ b/hgctl/cmd/hgctl/config/gateway_config_test.go
@@ -148,8 +148,7 @@ func TestExtractSubResourcesConfigDump(t *testing.T) {
 			output:       "yaml",
 			resourceType: BootstrapEnvoyConfigType,
 			expected:     "out.bootstrap.yaml",
-		},
-		{
+		}, {
 			output:       "json",
 			resourceType: ClusterEnvoyConfigType,
 			expected:     "out.cluster.json",
@@ -158,8 +157,7 @@ func TestExtractSubResourcesConfigDump(t *testing.T) {
 			output:       "yaml",
 			resourceType: ClusterEnvoyConfigType,
 			expected:     "out.cluster.yaml",
-		},
-		{
+		}, {
 			output:       "json",
 			resourceType: ListenerEnvoyConfigType,
 			expected:     "out.listener.json",
@@ -168,8 +166,7 @@ func TestExtractSubResourcesConfigDump(t *testing.T) {
 			output:       "yaml",
 			resourceType: ListenerEnvoyConfigType,
 			expected:     "out.listener.yaml",
-		},
-		{
+		}, {
 			output:       "json",
 			resourceType: RouteEnvoyConfigType,
 			expected:     "out.route.json",
--- a/hgctl/cmd/hgctl/main.go
+++ b/hgctl/cmd/hgctl/main.go
@@ -18,7 +18,7 @@ import (
 	"fmt"
 	"os"

-	hgctl "github.com/alibaba/higress/hgctl/pkg"
+	"github.com/alibaba/higress/hgctl/pkg"
 )

 func main() {
--- a/hgctl/go.mod
+++ b/hgctl/go.mod
@@ -15,11 +15,9 @@ replace github.com/docker/distribution => github.com/docker/distribution v0.0.0-
 // Client-go does not handle different versions of mergo due to some breaking changes - use the matching version
 replace github.com/imdario/mergo => github.com/imdario/mergo v0.3.5

-replace github.com/alibaba/higress/v2 => ../
-
 require (
 	github.com/AlecAivazis/survey/v2 v2.3.7
-	github.com/alibaba/higress/v2 v2.0.0-00010101000000-000000000000
+	github.com/alibaba/higress v0.0.0
 	github.com/compose-spec/compose-go v1.17.0
 	github.com/docker/cli v24.0.7+incompatible
 	github.com/docker/compose/v2 v2.23.3
--- a/hgctl/pkg/config_cmd.go
+++ b/hgctl/pkg/config_cmd.go
@@ -18,7 +18,7 @@ import (
 	"fmt"

 	"github.com/alibaba/higress/hgctl/cmd/hgctl/config"
-	"github.com/alibaba/higress/v2/pkg/cmd/options"
+	"github.com/alibaba/higress/pkg/cmd/options"
 	"github.com/spf13/cobra"
 	cmdutil "k8s.io/kubectl/pkg/cmd/util"
 )
--- a/hgctl/pkg/dashboard.go
+++ b/hgctl/pkg/dashboard.go
@@ -30,7 +30,7 @@ import (

 	"github.com/alibaba/higress/hgctl/pkg/docker"
 	"github.com/alibaba/higress/hgctl/pkg/kubernetes"
-	"github.com/alibaba/higress/v2/pkg/cmd/options"
+	"github.com/alibaba/higress/pkg/cmd/options"
 )

 var (
@@ -418,6 +418,7 @@ func openBrowser(url string, writer io.Writer, browser bool) {
 	default:
 		fmt.Fprintf(writer, "Unsupported platform %q; open %s in your browser.\n", runtime.GOOS, url)
 	}
+
 }

 func openCommand(writer io.Writer, command string, args ...string) {
--- a/hgctl/pkg/helm/common.go
+++ b/hgctl/pkg/helm/common.go
@@ -137,6 +137,7 @@ func GenerateConfig(inFilenames []string, setFlags []string) (string, *Profile,
 	}

 	profileString, profile, err := GenProfile(profileName, valuesOverlay, setFlags)
+
 	if err != nil {
 		return "", nil, "", err
 	}
--- a/hgctl/pkg/helm/object/objects_test.go
+++ b/hgctl/pkg/helm/object/objects_test.go
@@ -652,14 +652,14 @@ func TestK8sObject_ResolveK8sConflict(t *testing.T) {
                  kind: PodDisruptionBudget
                  metadata:
                    name: istio
-                  spec:
+                  spec: 
                    maxUnavailable: 3`),
 			o2: getK8sObject(`
                  apiVersion: policy/v1
                  kind: PodDisruptionBudget
                  metadata:
                    name: istio
-                  spec:
+                  spec: 
                    maxUnavailable: 3`),
 		},
 		{
@@ -669,7 +669,7 @@ func TestK8sObject_ResolveK8sConflict(t *testing.T) {
                  kind: PodDisruptionBudget
                  metadata:
                    name: istio
-                  spec:
+                  spec: 
                    maxUnavailable: 50%
                    minAvailable: 3`),
 			o2: getK8sObject(`
@@ -677,7 +677,7 @@ func TestK8sObject_ResolveK8sConflict(t *testing.T) {
                  kind: PodDisruptionBudget
                  metadata:
                    name: istio
-                  spec:
+                  spec: 
                    maxUnavailable: 50%`),
 		},
 		{
@@ -687,7 +687,7 @@ func TestK8sObject_ResolveK8sConflict(t *testing.T) {
                  kind: PodDisruptionBudget
                  metadata:
                    name: istio
-                  spec:
+                  spec: 
                    minAvailable: 0
                    maxUnavailable: 0`),
 			o2: getK8sObject(`
@@ -704,9 +704,9 @@ func TestK8sObject_ResolveK8sConflict(t *testing.T) {
 		t.Run(tt.desc, func(t *testing.T) {
 			newObj := tt.o1.ResolveK8sConflict()
 			if !newObj.Equal(tt.o2) {
-				newObjJson, _ := newObj.JSON()
-				wantedObjJson, _ := tt.o2.JSON()
-				t.Errorf("Got: %s, want: %s", string(newObjJson), string(wantedObjJson))
+				newObjjson, _ := newObj.JSON()
+				wantedObjjson, _ := tt.o2.JSON()
+				t.Errorf("Got: %s, want: %s", string(newObjjson), string(wantedObjjson))
 			}
 		})
 	}
--- a/hgctl/pkg/helm/render.go
+++ b/hgctl/pkg/helm/render.go
@@ -585,6 +585,7 @@ func locateChart(cpOpts *action.ChartPathOptions, name string, settings *cli.Env
 }

 func ParseLatestVersion(repoUrl string, version string, devel bool) (string, error) {
+
 	cpOpts := &action.ChartPathOptions{
 		RepoURL: repoUrl,
 		Version: version,
@@ -602,6 +603,7 @@ func ParseLatestVersion(repoUrl string, version string, devel bool) (string, err
 	}

 	client, err := getter.All(settings).ByScheme(u.Scheme)
+
 	if err != nil {
 		return "", fmt.Errorf("could not find protocol handler for: %s", u.Scheme)
 	}
@@ -613,6 +615,7 @@ func ParseLatestVersion(repoUrl string, version string, devel bool) (string, err
 		getter.WithBasicAuth(cpOpts.Username, cpOpts.Password),
 		getter.WithPassCredentialsAll(cpOpts.PassCredentialsAll),
 	)
+
 	if err != nil {
 		return "", err
 	}
--- a/hgctl/pkg/helm/tpath/tree.go
+++ b/hgctl/pkg/helm/tpath/tree.go
@@ -63,6 +63,7 @@ func GetPathContext(root any, path util.Path, createMissing bool) (*PathContext,

 // WritePathContext writes the given value to the Node in the given PathContext.
 func WritePathContext(nc *PathContext, value any, merge bool) error {
+
 	if !util.IsValueNil(value) {
 		return setPathContext(nc, value, merge)
 	}
--- a/hgctl/pkg/helm/tpath/tree_test.go
+++ b/hgctl/pkg/helm/tpath/tree_test.go
@@ -114,7 +114,7 @@ a:
 			desc: "ModifyListEntryMapValue",
 			path: `a.b.[name:n2]`,
 			value: `name: n2
-list:
+list: 
  - nk1: nv1
  - nk2: nv2`,
 			wantFound: true,
@@ -503,7 +503,7 @@ a: {}
 			want: `
 a:
  list:
-    - v1
+    - v1		
 `,
 		},
 		{
@@ -517,7 +517,7 @@ a:
 			value: `v2`,
 			want: `
 a:
-  list:
+  list: 
  - v1
  - v2
 `,
--- a/hgctl/pkg/install.go
+++ b/hgctl/pkg/install.go
@@ -22,7 +22,7 @@ import (

 	"github.com/alibaba/higress/hgctl/pkg/helm"
 	"github.com/alibaba/higress/hgctl/pkg/installer"
-	"github.com/alibaba/higress/v2/pkg/cmd/options"
+	"github.com/alibaba/higress/pkg/cmd/options"
 	"github.com/spf13/cobra"
 )

@@ -91,8 +91,8 @@ func newInstallCmd() *cobra.Command {
 		Example: `  # Apply a default higress installation
  hgctl install

-  # Install higress on local kubernetes cluster
-  hgctl install --set profile=local-k8s
+  # Install higress on local kubernetes cluster 
+  hgctl install --set profile=local-k8s 

  # Install higress on local docker environment with specific gateway port
  hgctl install --set profile=local-docker --set gateway.httpPort=80 --set gateway.httpsPort=443
@@ -192,6 +192,7 @@ func promptProfileName(writer io.Writer) string {
 			return profileNameLocalDocker
 		}
 	}
+
 }

 func installManifests(profile *helm.Profile, writer io.Writer, devel bool) error {
--- a/hgctl/pkg/installer/helm_agent.go
+++ b/hgctl/pkg/installer/helm_agent.go
@@ -22,7 +22,7 @@ import (
 	"strings"

 	"github.com/alibaba/higress/hgctl/pkg/helm"
-	"github.com/alibaba/higress/v2/pkg/cmd/options"
+	"github.com/alibaba/higress/pkg/cmd/options"
 )

 type HelmRelease struct {
--- a/hgctl/pkg/installer/installer.go
+++ b/hgctl/pkg/installer/installer.go
@@ -24,7 +24,7 @@ import (

 	"github.com/alibaba/higress/hgctl/pkg/helm"
 	"github.com/alibaba/higress/hgctl/pkg/kubernetes"
-	"github.com/alibaba/higress/v2/pkg/cmd/options"
+	"github.com/alibaba/higress/pkg/cmd/options"
 	"k8s.io/client-go/util/homedir"
 )

--- a/hgctl/pkg/installer/installer_docker.go
+++ b/hgctl/pkg/installer/installer_docker.go
@@ -48,6 +48,7 @@ func (d *DockerInstaller) Install() error {
 }

 func (d *DockerInstaller) UnInstall() error {
+
 	fmt.Fprintf(d.writer, "\n⌛️ Processing uninstallation... \n\n")

 	if err := d.standalone.UnInstall(); err != nil {
--- a/hgctl/pkg/installer/installer_k8s.go
+++ b/hgctl/pkg/installer/installer_k8s.go
@@ -65,7 +65,7 @@ func (o *K8sInstaller) Install() error {
 		return err1
 	}
 	fmt.Fprintf(o.writer, "\n✔️ Wrote Profile in kubernetes configmap: \"%s\" \n", profileName)
-	fmt.Fprintf(o.writer, "\n   Use below kubectl command to edit profile for upgrade. \n")
+	fmt.Fprintf(o.writer, "\n   Use bellow kubectl command to edit profile for upgrade. \n")
 	fmt.Fprintf(o.writer, "   ================================================================================== \n")
 	names := strings.Split(profileName, "/")
 	fmt.Fprintf(o.writer, "   kubectl edit configmap %s -n %s \n", names[1], names[0])
--- a/hgctl/pkg/installer/profile_store.go
+++ b/hgctl/pkg/installer/profile_store.go
@@ -59,7 +59,7 @@ type FileDirProfileStore struct {
 func (f *FileDirProfileStore) Save(profile *helm.Profile) (string, error) {
 	namespace := profile.Global.Namespace
 	install := profile.Global.Install
-	profileName := ""
+	var profileName = ""
 	if install == helm.InstallK8s || install == helm.InstallLocalK8s {
 		profileName = filepath.Join(f.profilesPath, fmt.Sprintf("%s-%s.yaml", ProfileFilePrefix, namespace))
 	} else {
@@ -109,7 +109,7 @@ func (f *FileDirProfileStore) List() ([]*ProfileContext, error) {
 func (f *FileDirProfileStore) Delete(profile *helm.Profile) (string, error) {
 	namespace := profile.Global.Namespace
 	install := profile.Global.Install
-	profileName := ""
+	var profileName = ""
 	if install == helm.InstallK8s || install == helm.InstallLocalK8s {
 		profileName = filepath.Join(f.profilesPath, fmt.Sprintf("%s-%s.yaml", ProfileFilePrefix, namespace))
 	} else {
--- a/hgctl/pkg/manifest.go
+++ b/hgctl/pkg/manifest.go
@@ -22,7 +22,7 @@ import (
 	"github.com/alibaba/higress/hgctl/pkg/helm"
 	"github.com/alibaba/higress/hgctl/pkg/installer"
 	"github.com/alibaba/higress/hgctl/pkg/kubernetes"
-	"github.com/alibaba/higress/v2/pkg/cmd/options"
+	"github.com/alibaba/higress/pkg/cmd/options"
 	"github.com/spf13/cobra"
 )

--- a/Show More
+++ b/Show More