release: v2.1.9-rc.1 (#2984)

Signed-off-by: guochenxu <guochenxu11@outlook.com>

.github/ISSUE_TEMPLATE/non--crash-security--bug.md

@@ -35,9 +35,15 @@ 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: 

.github/workflows/generate-release-notes.yaml

@@ -29,6 +29,7 @@ jobs:
         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
@@ -65,6 +66,40 @@ jobs:
               "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%,}
@@ -87,11 +122,24 @@ jobs:
           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
-              uv run report_main.py --mode 2 --choice 2 --pr_nums ${PR_NUMS} --important_prs ${IMPORTANT_PR_NUMS}
-          else
-              uv run report_main.py --mode 2 --choice 2 --pr_nums ${PR_NUMS}
+              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 ..

DEP_VERSION

@@ -1 +1 @@
-higress-console: v2.1.7
+higress-console: v2.1.8

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/pkg/cmd/lversion
+VERSION_PACKAGE := github.com/alibaba/higress/v2/pkg/cmd/lversion
 
 GIT_COMMIT:=$(shell git rev-parse HEAD)
 
@@ -137,9 +137,9 @@ endif
 # for now docker is limited to Linux compiles - why ?
 include docker/docker.mk
 
-docker-build-amd64: docker.higress-amd64 ## Build and push amdd64 docker images to registry defined by $HUB and $TAG
+docker-build-amd64: clean-higress docker.higress-amd64 ## Build and push amdd64 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-build: clean-higress docker.higress ## Build and push docker images to registry defined by $HUB and $TAG
 
 docker-buildx-push: clean-env docker.higress-buildx
 

README.md

@@ -17,11 +17,14 @@
 </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?

README_JP.md

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

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>
 
 

VERSION

@@ -1 +1 @@
-v2.1.7
+v2.1.9-rc.1

api/cue.yaml

@@ -1,6 +1,6 @@
 # Cuelang configuration to generate OpenAPI schema for Higress configs.
 
-module: github.com/alibaba/higress/api
+module: github.com/alibaba/higress/v2/api
 
 openapi:
   selfContained: true

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/api/extensions/v1alpha1";
+option go_package="github.com/alibaba/higress/v2/api/extensions/v1alpha1";
 
 // <!-- crd generation tags
 // +cue-gen:WasmPlugin:groupName:extensions.higress.io

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

api/kubernetes/customresourcedefinitions.gen.yaml

@@ -332,6 +332,20 @@ spec:
                       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

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/api/networking/v1";
+option go_package = "github.com/alibaba/higress/v2/api/networking/v1";
 
 // <!-- crd generation tags
 // +cue-gen:Http2Rpc:groupName:networking.higress.io

api/networking/v1/mcp_bridge.pb.go

@@ -119,32 +119,33 @@ type RegistryConfig struct {
 	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"`
+	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"`
 }
 
 func (x *RegistryConfig) Reset() {
@@ -361,6 +362,13 @@ func (x *RegistryConfig) GetProxyName() string {
 	return ""
 }
 
+func (x *RegistryConfig) GetVport() *RegistryConfig_VPort {
+	if x != nil {
+		return x.Vport
+	}
+	return nil
+}
+
 type ProxyConfig struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -495,6 +503,116 @@ func (x *InnerMap) GetInnerMap() map[string]string {
 	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{
@@ -516,7 +634,7 @@ var file_networking_v1_mcp_bridge_proto_rawDesc = []byte{
 	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, 0xc6, 0x09, 0x0a, 0x0e, 0x52, 0x65,
+	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,
@@ -587,39 +705,54 @@ var file_networking_v1_mcp_bridge_proto_rawDesc = []byte{
 	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, 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, 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,
+	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,
 }
 
 var (
@@ -634,29 +767,33 @@ 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, 6)
+var file_networking_v1_mcp_bridge_proto_msgTypes = make([]protoimpl.MessageInfo, 8)
 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
-	nil,                        // 5: higress.networking.v1.InnerMap.InnerMapEntry
-	(*wrappers.BoolValue)(nil), // 6: google.protobuf.BoolValue
+	(*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
 }
 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
-	6, // 2: higress.networking.v1.RegistryConfig.enableMCPServer:type_name -> google.protobuf.BoolValue
-	6, // 3: higress.networking.v1.RegistryConfig.enableScopeMcpServers:type_name -> google.protobuf.BoolValue
+	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.InnerMap.inner_map:type_name -> higress.networking.v1.InnerMap.InnerMapEntry
-	3, // 6: higress.networking.v1.RegistryConfig.MetadataEntry.value:type_name -> higress.networking.v1.InnerMap
-	7, // [7:7] is the sub-list for method output_type
-	7, // [7:7] is the sub-list for method input_type
-	7, // [7:7] is the sub-list for extension type_name
-	7, // [7:7] is the sub-list for extension extendee
-	0, // [0:7] is the sub-list for field type_name
+	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
 }
 
 func init() { file_networking_v1_mcp_bridge_proto_init() }
@@ -713,6 +850,30 @@ func file_networking_v1_mcp_bridge_proto_init() {
 				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{
@@ -720,7 +881,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:   6,
+			NumMessages:   8,
 			NumExtensions: 0,
 			NumServices:   0,
 		},

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/api/networking/v1";
+option go_package = "github.com/alibaba/higress/v2/api/networking/v1";
 
 // <!-- crd generation tags
 // +cue-gen:McpBridge:groupName:networking.higress.io
@@ -50,7 +50,7 @@ message McpBridge {
 }
 
 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];
@@ -76,6 +76,15 @@ message RegistryConfig {
   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 {

api/networking/v1/mcp_bridge_deepcopy.gen.go

@@ -47,6 +47,48 @@ 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)

api/networking/v1/mcp_bridge_json.gen.go

@@ -28,6 +28,28 @@ 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)

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/api/networking/v1, \
-	github.com/alibaba/higress/api/extensions/v1alpha1 \
+	github.com/alibaba/higress/v2/api/networking/v1, \
+	github.com/alibaba/higress/v2/api/extensions/v1alpha1 \
 	)
 
 # base output package for generated files
-kube_base_output_package = github.com/alibaba/higress/client/pkg
+kube_base_output_package = github.com/alibaba/higress/v2/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/client/, $(empty), $(subst $(comma), $(space), $(kube_api_packages)) $(kube_clientset_package) $(kube_listers_package) $(kube_informers_package)) \
+	find $(subst github.com/alibaba/higress/v2/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

client/pkg/apis/extensions/v1alpha1/types.gen.go

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

client/pkg/apis/networking/v1/types.gen.go

@@ -17,7 +17,7 @@
 package v1
 
 import (
-	networkingv1 "github.com/alibaba/higress/api/networking/v1"
+	networkingv1 "github.com/alibaba/higress/v2/api/networking/v1"
 	v1alpha1 "istio.io/api/meta/v1alpha1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )

client/pkg/applyconfiguration/extensions/v1alpha1/wasmplugin.go

@@ -17,8 +17,8 @@
 package v1alpha1
 
 import (
-	v1alpha1 "github.com/alibaba/higress/api/extensions/v1alpha1"
-	v1 "github.com/alibaba/higress/client/pkg/applyconfiguration/meta/v1"
+	v1alpha1 "github.com/alibaba/higress/v2/api/extensions/v1alpha1"
+	v1 "github.com/alibaba/higress/v2/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"

client/pkg/applyconfiguration/networking/v1/http2rpc.go

@@ -17,8 +17,8 @@
 package v1
 
 import (
-	networkingv1 "github.com/alibaba/higress/api/networking/v1"
-	v1 "github.com/alibaba/higress/client/pkg/applyconfiguration/meta/v1"
+	networkingv1 "github.com/alibaba/higress/v2/api/networking/v1"
+	v1 "github.com/alibaba/higress/v2/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"

client/pkg/applyconfiguration/networking/v1/mcpbridge.go

@@ -17,8 +17,8 @@
 package v1
 
 import (
-	networkingv1 "github.com/alibaba/higress/api/networking/v1"
-	v1 "github.com/alibaba/higress/client/pkg/applyconfiguration/meta/v1"
+	networkingv1 "github.com/alibaba/higress/v2/api/networking/v1"
+	v1 "github.com/alibaba/higress/v2/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"

client/pkg/applyconfiguration/utils.go

@@ -17,11 +17,11 @@
 package applyconfiguration
 
 import (
-	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"
+	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"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
 )

client/pkg/clientset/versioned/clientset.gen.go

@@ -20,8 +20,8 @@ import (
 	"fmt"
 	"net/http"
 
-	extensionsv1alpha1 "github.com/alibaba/higress/client/pkg/clientset/versioned/typed/extensions/v1alpha1"
-	networkingv1 "github.com/alibaba/higress/client/pkg/clientset/versioned/typed/networking/v1"
+	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"
 	discovery "k8s.io/client-go/discovery"
 	rest "k8s.io/client-go/rest"
 	flowcontrol "k8s.io/client-go/util/flowcontrol"

client/pkg/clientset/versioned/fake/clientset_generated.gen.go

@@ -17,11 +17,11 @@
 package fake
 
 import (
-	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"
+	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"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/watch"
 	"k8s.io/client-go/discovery"

client/pkg/clientset/versioned/fake/register.gen.go

@@ -17,8 +17,8 @@
 package fake
 
 import (
-	extensionsv1alpha1 "github.com/alibaba/higress/client/pkg/apis/extensions/v1alpha1"
-	networkingv1 "github.com/alibaba/higress/client/pkg/apis/networking/v1"
+	extensionsv1alpha1 "github.com/alibaba/higress/v2/client/pkg/apis/extensions/v1alpha1"
+	networkingv1 "github.com/alibaba/higress/v2/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,8 +26,10 @@ import (
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 )
 
-var scheme = runtime.NewScheme()
-var codecs = serializer.NewCodecFactory(scheme)
+var (
+	scheme = runtime.NewScheme()
+	codecs = serializer.NewCodecFactory(scheme)
+)
 
 var localSchemeBuilder = runtime.SchemeBuilder{
 	extensionsv1alpha1.AddToScheme,

client/pkg/clientset/versioned/scheme/register.gen.go

@@ -17,8 +17,8 @@
 package scheme
 
 import (
-	extensionsv1alpha1 "github.com/alibaba/higress/client/pkg/apis/extensions/v1alpha1"
-	networkingv1 "github.com/alibaba/higress/client/pkg/apis/networking/v1"
+	extensionsv1alpha1 "github.com/alibaba/higress/v2/client/pkg/apis/extensions/v1alpha1"
+	networkingv1 "github.com/alibaba/higress/v2/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,13 +26,15 @@ import (
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 )
 
-var Scheme = runtime.NewScheme()
-var Codecs = serializer.NewCodecFactory(Scheme)
-var ParameterCodec = runtime.NewParameterCodec(Scheme)
-var localSchemeBuilder = runtime.SchemeBuilder{
-	extensionsv1alpha1.AddToScheme,
-	networkingv1.AddToScheme,
-}
+var (
+	Scheme             = runtime.NewScheme()
+	Codecs             = serializer.NewCodecFactory(Scheme)
+	ParameterCodec     = runtime.NewParameterCodec(Scheme)
+	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:

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/client/pkg/apis/extensions/v1alpha1"
-	"github.com/alibaba/higress/client/pkg/clientset/versioned/scheme"
+	v1alpha1 "github.com/alibaba/higress/v2/client/pkg/apis/extensions/v1alpha1"
+	"github.com/alibaba/higress/v2/client/pkg/clientset/versioned/scheme"
 	rest "k8s.io/client-go/rest"
 )
 

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/client/pkg/clientset/versioned/typed/extensions/v1alpha1"
+	v1alpha1 "github.com/alibaba/higress/v2/client/pkg/clientset/versioned/typed/extensions/v1alpha1"
 	rest "k8s.io/client-go/rest"
 	testing "k8s.io/client-go/testing"
 )

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/client/pkg/apis/extensions/v1alpha1"
-	extensionsv1alpha1 "github.com/alibaba/higress/client/pkg/applyconfiguration/extensions/v1alpha1"
+	v1alpha1 "github.com/alibaba/higress/v2/client/pkg/apis/extensions/v1alpha1"
+	extensionsv1alpha1 "github.com/alibaba/higress/v2/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,7 +77,6 @@ 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.

client/pkg/clientset/versioned/typed/extensions/v1alpha1/wasmplugin.gen.go

@@ -22,9 +22,9 @@ import (
 	"fmt"
 	"time"
 
-	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"
+	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"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	types "k8s.io/apimachinery/pkg/types"
 	watch "k8s.io/apimachinery/pkg/watch"

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/client/pkg/apis/networking/v1"
-	networkingv1 "github.com/alibaba/higress/client/pkg/applyconfiguration/networking/v1"
+	v1 "github.com/alibaba/higress/v2/client/pkg/apis/networking/v1"
+	networkingv1 "github.com/alibaba/higress/v2/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,7 +77,6 @@ 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.

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/client/pkg/apis/networking/v1"
-	networkingv1 "github.com/alibaba/higress/client/pkg/applyconfiguration/networking/v1"
+	v1 "github.com/alibaba/higress/v2/client/pkg/apis/networking/v1"
+	networkingv1 "github.com/alibaba/higress/v2/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,7 +77,6 @@ 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.

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/client/pkg/clientset/versioned/typed/networking/v1"
+	v1 "github.com/alibaba/higress/v2/client/pkg/clientset/versioned/typed/networking/v1"
 	rest "k8s.io/client-go/rest"
 	testing "k8s.io/client-go/testing"
 )

client/pkg/clientset/versioned/typed/networking/v1/http2rpc.gen.go

@@ -22,9 +22,9 @@ import (
 	"fmt"
 	"time"
 
-	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"
+	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"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	types "k8s.io/apimachinery/pkg/types"
 	watch "k8s.io/apimachinery/pkg/watch"

client/pkg/clientset/versioned/typed/networking/v1/mcpbridge.gen.go

@@ -22,9 +22,9 @@ import (
 	"fmt"
 	"time"
 
-	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"
+	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"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	types "k8s.io/apimachinery/pkg/types"
 	watch "k8s.io/apimachinery/pkg/watch"

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/client/pkg/apis/networking/v1"
-	"github.com/alibaba/higress/client/pkg/clientset/versioned/scheme"
+	v1 "github.com/alibaba/higress/v2/client/pkg/apis/networking/v1"
+	"github.com/alibaba/higress/v2/client/pkg/clientset/versioned/scheme"
 	rest "k8s.io/client-go/rest"
 )
 

client/pkg/informers/externalversions/extensions/interface.gen.go

@@ -17,8 +17,8 @@
 package extensions
 
 import (
-	v1alpha1 "github.com/alibaba/higress/client/pkg/informers/externalversions/extensions/v1alpha1"
-	internalinterfaces "github.com/alibaba/higress/client/pkg/informers/externalversions/internalinterfaces"
+	v1alpha1 "github.com/alibaba/higress/v2/client/pkg/informers/externalversions/extensions/v1alpha1"
+	internalinterfaces "github.com/alibaba/higress/v2/client/pkg/informers/externalversions/internalinterfaces"
 )
 
 // Interface provides access to each of this group's versions.

client/pkg/informers/externalversions/extensions/v1alpha1/interface.gen.go

@@ -17,7 +17,7 @@
 package v1alpha1
 
 import (
-	internalinterfaces "github.com/alibaba/higress/client/pkg/informers/externalversions/internalinterfaces"
+	internalinterfaces "github.com/alibaba/higress/v2/client/pkg/informers/externalversions/internalinterfaces"
 )
 
 // Interface provides access to all the informers in this group version.

client/pkg/informers/externalversions/extensions/v1alpha1/wasmplugin.gen.go

@@ -20,10 +20,10 @@ import (
 	"context"
 	time "time"
 
-	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"
+	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"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"

client/pkg/informers/externalversions/factory.gen.go

@@ -21,10 +21,10 @@ import (
 	sync "sync"
 	time "time"
 
-	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"
+	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"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"

client/pkg/informers/externalversions/generic.gen.go

@@ -19,8 +19,8 @@ package externalversions
 import (
 	"fmt"
 
-	v1alpha1 "github.com/alibaba/higress/client/pkg/apis/extensions/v1alpha1"
-	v1 "github.com/alibaba/higress/client/pkg/apis/networking/v1"
+	v1alpha1 "github.com/alibaba/higress/v2/client/pkg/apis/extensions/v1alpha1"
+	v1 "github.com/alibaba/higress/v2/client/pkg/apis/networking/v1"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
 	cache "k8s.io/client-go/tools/cache"
 )

client/pkg/informers/externalversions/internalinterfaces/factory_interfaces.gen.go

@@ -19,7 +19,7 @@ package internalinterfaces
 import (
 	time "time"
 
-	versioned "github.com/alibaba/higress/client/pkg/clientset/versioned"
+	versioned "github.com/alibaba/higress/v2/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"

client/pkg/informers/externalversions/networking/interface.gen.go

@@ -17,8 +17,8 @@
 package networking
 
 import (
-	internalinterfaces "github.com/alibaba/higress/client/pkg/informers/externalversions/internalinterfaces"
-	v1 "github.com/alibaba/higress/client/pkg/informers/externalversions/networking/v1"
+	internalinterfaces "github.com/alibaba/higress/v2/client/pkg/informers/externalversions/internalinterfaces"
+	v1 "github.com/alibaba/higress/v2/client/pkg/informers/externalversions/networking/v1"
 )
 
 // Interface provides access to each of this group's versions.

client/pkg/informers/externalversions/networking/v1/http2rpc.gen.go

@@ -20,10 +20,10 @@ import (
 	"context"
 	time "time"
 
-	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"
+	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"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"

client/pkg/informers/externalversions/networking/v1/interface.gen.go

@@ -17,7 +17,7 @@
 package v1
 
 import (
-	internalinterfaces "github.com/alibaba/higress/client/pkg/informers/externalversions/internalinterfaces"
+	internalinterfaces "github.com/alibaba/higress/v2/client/pkg/informers/externalversions/internalinterfaces"
 )
 
 // Interface provides access to all the informers in this group version.

client/pkg/informers/externalversions/networking/v1/mcpbridge.gen.go

@@ -20,10 +20,10 @@ import (
 	"context"
 	time "time"
 
-	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"
+	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"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"

client/pkg/listers/extensions/v1alpha1/wasmplugin.gen.go

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

client/pkg/listers/networking/v1/http2rpc.gen.go

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

client/pkg/listers/networking/v1/mcpbridge.gen.go

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

cmd/higress/main.go

@@ -20,7 +20,7 @@ import (
 
 	"istio.io/pkg/log"
 
-	"github.com/alibaba/higress/pkg/cmd"
+	"github.com/alibaba/higress/v2/pkg/cmd"
 )
 
 func main() {

docker/Dockerfile.higress

@@ -12,7 +12,8 @@ ARG TARGETARCH
 # This base image is provided by istio, see: https://github.com/istio/istio/blob/master/docker/Dockerfile.base
 FROM ${HUB}/base:${BASE_VERSION}-${TARGETARCH}
 
-COPY ${TARGETARCH:-amd64}/higress /usr/local/bin/higress
+ARG TARGETARCH
+COPY ${TARGETARCH}/higress /usr/local/bin/higress
 
 USER 1337:1337
 

go.mod

@@ -1,4 +1,4 @@
-module github.com/alibaba/higress
+module github.com/alibaba/higress/v2
 
 go 1.22.2
 

helm/core/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 2.1.7
+appVersion: 2.1.9-rc.1
 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.7
+version: 2.1.9-rc.1

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.

helm/core/crds/customresourcedefinitions.gen.yaml

@@ -332,6 +332,20 @@ spec:
                       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

helm/core/templates/configmap.yaml

@@ -112,6 +112,9 @@ 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 }}

helm/core/templates/fallback-envoyfilter.yaml

@@ -19,4 +19,7 @@ spec:
         value:
           name: envoy.filters.http.custom_response
           typed_config:
-            "@type": type.googleapis.com/envoy.extensions.filters.http.custom_response.v3.CustomResponse
+            "@type": type.googleapis.com/envoy.extensions.filters.http.custom_response.v3.CustomResponse
+  workloadSelector:
+    labels:
+      {{- include "gateway.selectorLabels" . | nindent 6 }}

helm/core/values.yaml

@@ -732,6 +732,26 @@ 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

helm/higress/Chart.lock

@@ -1,9 +1,9 @@
 dependencies:
 - name: higress-core
   repository: file://../core
-  version: 2.1.7
+  version: 2.1.9-rc.1
 - name: higress-console
   repository: https://higress.io/helm-charts/
-  version: 2.1.7
-digest: sha256:c5bc8ddcc56c66751217aee5c7a40da0a906bfa9fc5c671cc4ae6e456db6bc21
-generated: "2025-09-01T15:19:26.228634+08:00"
+  version: 2.1.8
+digest: sha256:0899e57f8744790bef3061413d6ce43ca4a54ac21fbe44fc0af7db973da28a79
+generated: "2025-10-09T17:25:21.377573+08:00"

helm/higress/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 2.1.7
+appVersion: 2.1.9-rc.1
 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.7
+  version: 2.1.9-rc.1
 - name: higress-console
   repository: "https://higress.io/helm-charts/"
-  version: 2.1.7
+  version: 2.1.8
 type: application
-version: 2.1.7
+version: 2.1.9-rc.1

helm/higress/README.md

@@ -242,6 +242,7 @@ 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. |

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/pkg/cmd/options"
+	"github.com/alibaba/higress/v2/pkg/cmd/options"
 )
 
 var (

hgctl/cmd/hgctl/config/gateway_config_test.go

@@ -148,7 +148,8 @@ func TestExtractSubResourcesConfigDump(t *testing.T) {
 			output:       "yaml",
 			resourceType: BootstrapEnvoyConfigType,
 			expected:     "out.bootstrap.yaml",
-		}, {
+		},
+		{
 			output:       "json",
 			resourceType: ClusterEnvoyConfigType,
 			expected:     "out.cluster.json",
@@ -157,7 +158,8 @@ func TestExtractSubResourcesConfigDump(t *testing.T) {
 			output:       "yaml",
 			resourceType: ClusterEnvoyConfigType,
 			expected:     "out.cluster.yaml",
-		}, {
+		},
+		{
 			output:       "json",
 			resourceType: ListenerEnvoyConfigType,
 			expected:     "out.listener.json",
@@ -166,7 +168,8 @@ func TestExtractSubResourcesConfigDump(t *testing.T) {
 			output:       "yaml",
 			resourceType: ListenerEnvoyConfigType,
 			expected:     "out.listener.yaml",
-		}, {
+		},
+		{
 			output:       "json",
 			resourceType: RouteEnvoyConfigType,
 			expected:     "out.route.json",

hgctl/cmd/hgctl/main.go

@@ -18,7 +18,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/alibaba/higress/hgctl/pkg"
+	hgctl "github.com/alibaba/higress/hgctl/pkg"
 )
 
 func main() {

hgctl/go.mod

@@ -15,9 +15,11 @@ 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 v0.0.0
+	github.com/alibaba/higress/v2 v2.0.0-00010101000000-000000000000
 	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

hgctl/pkg/config_cmd.go

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

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/pkg/cmd/options"
+	"github.com/alibaba/higress/v2/pkg/cmd/options"
 )
 
 var (
@@ -418,7 +418,6 @@ 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) {

hgctl/pkg/helm/common.go

@@ -137,7 +137,6 @@ func GenerateConfig(inFilenames []string, setFlags []string) (string, *Profile,
 	}
 
 	profileString, profile, err := GenProfile(profileName, valuesOverlay, setFlags)
-
 	if err != nil {
 		return "", nil, "", err
 	}

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(`

hgctl/pkg/helm/render.go

@@ -585,7 +585,6 @@ 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,
@@ -603,7 +602,6 @@ 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)
 	}
@@ -615,7 +613,6 @@ 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
 	}

hgctl/pkg/helm/tpath/tree.go

@@ -63,7 +63,6 @@ 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)
 	}

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
 `,

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/pkg/cmd/options"
+	"github.com/alibaba/higress/v2/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,7 +192,6 @@ func promptProfileName(writer io.Writer) string {
 			return profileNameLocalDocker
 		}
 	}
-
 }
 
 func installManifests(profile *helm.Profile, writer io.Writer, devel bool) error {

hgctl/pkg/installer/helm_agent.go

@@ -22,7 +22,7 @@ import (
 	"strings"
 
 	"github.com/alibaba/higress/hgctl/pkg/helm"
-	"github.com/alibaba/higress/pkg/cmd/options"
+	"github.com/alibaba/higress/v2/pkg/cmd/options"
 )
 
 type HelmRelease struct {

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/pkg/cmd/options"
+	"github.com/alibaba/higress/v2/pkg/cmd/options"
 	"k8s.io/client-go/util/homedir"
 )
 

hgctl/pkg/installer/installer_docker.go

@@ -48,7 +48,6 @@ 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 {

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
-	var profileName = ""
+	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
-	var profileName = ""
+	profileName := ""
 	if install == helm.InstallK8s || install == helm.InstallLocalK8s {
 		profileName = filepath.Join(f.profilesPath, fmt.Sprintf("%s-%s.yaml", ProfileFilePrefix, namespace))
 	} else {

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/pkg/cmd/options"
+	"github.com/alibaba/higress/v2/pkg/cmd/options"
 	"github.com/spf13/cobra"
 )
 

hgctl/pkg/plugin/build/build.go

@@ -423,13 +423,11 @@ func (b *Builder) filesHandler() error {
 	return nil
 }
 
-var (
-	optionalProducts = [][2]string{
-		{"README_ZH.md", MediaTypeREADME_ZH},
-		{"README_EN.md", MediaTypeREADME_EN},
-		{"icon.png", MediaTypeIcon},
-	}
-)
+var optionalProducts = [][2]string{
+	{"README_ZH.md", MediaTypeREADME_ZH},
+	{"README_EN.md", MediaTypeREADME_EN},
+	{"icon.png", MediaTypeIcon},
+}
 
 // TODO(WeixinX): If the image exists, no push is performed
 func (b *Builder) imageHandler() error {
@@ -536,7 +534,7 @@ func (b *Builder) config(f ConfigFunc) (err error) {
 		if err != nil {
 			return errors.Wrapf(err, "failed to parse output destination %q", b.Output.Dest)
 		}
-		err = os.MkdirAll(b.Output.Dest, 0755)
+		err = os.MkdirAll(b.Output.Dest, 0o755)
 		if err != nil && !os.IsExist(err) {
 			return errors.Wrapf(err, "failed to create output destination %q", b.Output.Dest)
 		}
@@ -574,7 +572,7 @@ func (b *Builder) config(f ConfigFunc) (err error) {
 	if err != nil && !os.IsExist(err) {
 		return errors.Wrap(err, "failed to create the docker entrypoint file")
 	}
-	err = dockerEp.Chmod(0777)
+	err = dockerEp.Chmod(0o777)
 	if err != nil {
 		return err
 	}

hgctl/pkg/plugin/build/templates.go

@@ -47,11 +47,11 @@ cd {{ .BuildDestDir }}
 tar czf plugin.tar.gz plugin.wasm
 cmd="{{ .BasicCmd }}"
 products=({{ .Products }})
-for ((i=0; i<${#products[*]}; i=i+2)); do 
+for ((i=0; i<${#products[*]}; i=i+2)); do
   f=${products[i]}
   typ=${products[i+1]}
-  if [ -e ${f} ]; then 
-    cmd="${cmd} ./${f}:${typ}" 
+  if [ -e ${f} ]; then
+    cmd="${cmd} ./${f}:${typ}"
   fi
 done
 cmd="${cmd} ./plugin.tar.gz:{{ .MediaTypePlugin }}"
@@ -79,7 +79,7 @@ type ImageTmplFields struct {
 }
 
 func genFilesDockerEntrypoint(ft *FilesTmplFields, target string) error {
-	f, err := os.OpenFile(target, os.O_CREATE|os.O_WRONLY, 0777)
+	f, err := os.OpenFile(target, os.O_CREATE|os.O_WRONLY, 0o777)
 	if err != nil {
 		return err
 	}
@@ -93,7 +93,7 @@ func genFilesDockerEntrypoint(ft *FilesTmplFields, target string) error {
 }
 
 func genImageDockerEntrypoint(it *ImageTmplFields, target string) error {
-	f, err := os.OpenFile(target, os.O_CREATE|os.O_WRONLY, 0777)
+	f, err := os.OpenFile(target, os.O_CREATE|os.O_WRONLY, 0o777)
 	if err != nil {
 		return err
 	}

hgctl/pkg/plugin/config/create.go

@@ -49,7 +49,7 @@ func create(w io.Writer, target string) error {
 	if err != nil {
 		return errors.Wrap(err, "invalid target path")
 	}
-	if err = os.MkdirAll(target, 0755); err != nil {
+	if err = os.MkdirAll(target, 0o755); err != nil {
 		return err
 	}
 	if err = GenPluginConfYAML(configHelpTmpl, target); err != nil {

hgctl/pkg/plugin/config/edit.go

@@ -22,7 +22,7 @@ import (
 	"os"
 
 	k8s "github.com/alibaba/higress/hgctl/pkg/kubernetes"
-	"github.com/alibaba/higress/pkg/cmd/options"
+	"github.com/alibaba/higress/v2/pkg/cmd/options"
 
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"

hgctl/pkg/plugin/config/templates.go

@@ -156,5 +156,4 @@ func (pc *PluginConf) withDefaultValue() {
 	if pc.Phase == "" {
 		pc.Phase = string(types.PhaseDefault)
 	}
-
 }

hgctl/pkg/plugin/init/init.go

@@ -63,7 +63,7 @@ func runInit(w io.Writer, target string) (err error) {
 		return errors.Wrap(err, "invalid target directory")
 	}
 	dir := fmt.Sprintf("%s/%s", target, ans.Name)
-	err = os.MkdirAll(dir, 0755)
+	err = os.MkdirAll(dir, 0o755)
 	defer func() {
 		if err != nil {
 			os.RemoveAll(dir)

hgctl/pkg/plugin/install/install.go

@@ -28,7 +28,7 @@ import (
 	"github.com/alibaba/higress/hgctl/pkg/plugin/option"
 	"github.com/alibaba/higress/hgctl/pkg/plugin/types"
 	"github.com/alibaba/higress/hgctl/pkg/plugin/utils"
-	"github.com/alibaba/higress/pkg/cmd/options"
+	"github.com/alibaba/higress/v2/pkg/cmd/options"
 
 	"github.com/AlecAivazis/survey/v2/terminal"
 	"github.com/pkg/errors"

hgctl/pkg/plugin/ls/ls.go

@@ -21,7 +21,7 @@ import (
 	"time"
 
 	k8s "github.com/alibaba/higress/hgctl/pkg/kubernetes"
-	"github.com/alibaba/higress/pkg/cmd/options"
+	"github.com/alibaba/higress/v2/pkg/cmd/options"
 
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"

hgctl/pkg/plugin/test/create.go

@@ -51,7 +51,7 @@ func newCreateCommand() *cobra.Command {
 		Example: `  # If the option.yaml file exists in the current path, do the following:
   hgctl plugin test create
 
-  # Explicitly specify the source of the parameters (directory of the build 
+  # Explicitly specify the source of the parameters (directory of the build
     products) and the directory where the test configuration files is stored
   hgctl plugin test create -d ./out -t ./test
   `,
@@ -139,9 +139,8 @@ func (c *creator) create() (err error) {
 	fields.Envoy = &Envoy{JSONExample: jsExample}
 
 	// 4. generate corresponding test files
-	if err = os.MkdirAll(target, 0755); err != nil {
+	if err = os.MkdirAll(target, 0o755); err != nil {
 		return errors.Wrap(err, "failed to create the test environment")
-
 	}
 	if err = c.genTestConfFiles(fields); err != nil {
 		return errors.Wrap(err, "failed to create the test environment")

hgctl/pkg/plugin/types/testdata/types/ext/ext.go

@@ -22,10 +22,12 @@ type TestExStruct struct {
 	three []bool
 }
 
-type ExPointerInt **int
-type ExBool bool
-type ExSlice []*string
-type ExAlias nested.TestNestedStruct
+type (
+	ExPointerInt **int
+	ExBool       bool
+	ExSlice      []*string
+	ExAlias      nested.TestNestedStruct
+)
 
 type TestNestedStruct struct {
 	NestedStruct *nested.TestNestedStruct

hgctl/pkg/plugin/types/testdata/types/main.go

@@ -44,11 +44,13 @@ type TestAliasStruct struct {
 	MyStruct     MyStruct
 }
 
-type MyString string
-type MyPointerInt *int
-type MyStruct TestBasicStruct
-type NestedAlias ext.ExAlias
-type NestedBasicAlias ext.ExBool
+type (
+	MyString         string
+	MyPointerInt     *int
+	MyStruct         TestBasicStruct
+	NestedAlias      ext.ExAlias
+	NestedBasicAlias ext.ExBool
+)
 
 type TestExternalStruct struct {
 	InternalFloat float64
@@ -62,8 +64,7 @@ type TestNestedStruct struct {
 	NestedStruct *ext.TestNestedStruct
 }
 
-type MyInterface interface {
-}
+type MyInterface interface{}
 
 var MyConst bool
 

hgctl/pkg/plugin/uninstall/uninstall.go

@@ -20,7 +20,7 @@ import (
 	"io"
 
 	k8s "github.com/alibaba/higress/hgctl/pkg/kubernetes"
-	"github.com/alibaba/higress/pkg/cmd/options"
+	"github.com/alibaba/higress/v2/pkg/cmd/options"
 	"github.com/pkg/errors"
 
 	"github.com/spf13/cobra"

hgctl/pkg/profile_dump.go

@@ -61,7 +61,7 @@ func profileDump(cmd *cobra.Command, args []string, pdArgs *profileDumpArgs) err
 		return err
 	}
 	if len(pdArgs.output) > 0 {
-		err2 := os.WriteFile(pdArgs.output, []byte(yaml), 0644)
+		err2 := os.WriteFile(pdArgs.output, []byte(yaml), 0o644)
 		if err2 != nil {
 			return err2
 		}

hgctl/pkg/profile_list.go

@@ -44,7 +44,6 @@ func profileListCmd(plArgs *profileListArgs) *cobra.Command {
 
 // profileList list all the builtin profiles.
 func profileList(cmd *cobra.Command, plArgs *profileListArgs) error {
-
 	profiles, err := helm.ListProfiles(plArgs.manifestsPath)
 	if err != nil {
 		return err

hgctl/pkg/root.go

@@ -15,9 +15,10 @@
 package hgctl
 
 import (
+	"os"
+
 	"github.com/alibaba/higress/hgctl/pkg/plugin"
 	"github.com/spf13/cobra"
-	"os"
 )
 
 // GetRootCommand returns the root cobra command to be executed

hgctl/pkg/uninstall.go

@@ -23,7 +23,7 @@ import (
 	"github.com/alibaba/higress/hgctl/pkg/helm"
 	"github.com/alibaba/higress/hgctl/pkg/installer"
 	"github.com/alibaba/higress/hgctl/pkg/util"
-	"github.com/alibaba/higress/pkg/cmd/options"
+	"github.com/alibaba/higress/v2/pkg/cmd/options"
 	"github.com/spf13/cobra"
 )
 
@@ -44,9 +44,9 @@ func newUninstallCmd() *cobra.Command {
 		Use:   "uninstall",
 		Short: "Uninstall higress from a cluster",
 		Long:  "The uninstall command uninstalls higress from a cluster or local environment",
-		Example: `# Uninstall higress 
+		Example: `# Uninstall higress
   hgctl uninstal
-  
+
   # Uninstall higress, istioAPI and GatewayAPI from a cluster
   hgctl uninstall --purge-resources
 `,

hgctl/pkg/upgrade.go

@@ -25,7 +25,7 @@ import (
 	"github.com/alibaba/higress/hgctl/pkg/installer"
 	"github.com/alibaba/higress/hgctl/pkg/kubernetes"
 	"github.com/alibaba/higress/hgctl/pkg/util"
-	"github.com/alibaba/higress/pkg/cmd/options"
+	"github.com/alibaba/higress/v2/pkg/cmd/options"
 	"github.com/spf13/cobra"
 )
 

hgctl/pkg/version.go

@@ -22,8 +22,8 @@ import (
 	"strings"
 
 	"github.com/alibaba/higress/hgctl/pkg/kubernetes"
-	"github.com/alibaba/higress/pkg/cmd/options"
-	"github.com/alibaba/higress/pkg/cmd/version"
+	"github.com/alibaba/higress/v2/pkg/cmd/options"
+	"github.com/alibaba/higress/v2/pkg/cmd/version"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"gopkg.in/yaml.v2"

pkg/bootstrap/server.go

@@ -49,12 +49,12 @@ import (
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/cache"
 
-	"github.com/alibaba/higress/pkg/cert"
-	higressconfig "github.com/alibaba/higress/pkg/config"
-	"github.com/alibaba/higress/pkg/ingress/kube/common"
-	"github.com/alibaba/higress/pkg/ingress/mcp"
-	"github.com/alibaba/higress/pkg/ingress/translation"
-	higresskube "github.com/alibaba/higress/pkg/kube"
+	"github.com/alibaba/higress/v2/pkg/cert"
+	higressconfig "github.com/alibaba/higress/v2/pkg/config"
+	"github.com/alibaba/higress/v2/pkg/ingress/kube/common"
+	"github.com/alibaba/higress/v2/pkg/ingress/mcp"
+	"github.com/alibaba/higress/v2/pkg/ingress/translation"
+	higresskube "github.com/alibaba/higress/v2/pkg/kube"
 )
 
 type XdsOptions struct {

pkg/bootstrap/server_test.go

@@ -22,7 +22,7 @@ import (
 	"istio.io/istio/pilot/pkg/features"
 	"istio.io/istio/pkg/keepalive"
 
-	higresskube "github.com/alibaba/higress/pkg/kube"
+	higresskube "github.com/alibaba/higress/v2/pkg/kube"
 )
 
 func TestStartWithNoError(t *testing.T) {