Update import (#879)

mfordjody · web-flow · commit e171af47399d · 2026-03-20T20:49:40.000+08:00
* Update import

* Update import v2

* Update import v3

* Update description
diff --git a/.asf.yaml b/.asf.yaml
@@ -20,8 +20,8 @@ notifications:
     jira_options: link label
 
 github:
-  homepage: "https://dubbo-inherent.github.io/"
-  description: "Dubbo Inherent Mesh for Kubernetes."
+  homepage: "https://kdubbo.github.io"
+  description: "Embed gRPC, use xDS, build inherent mesh."
   features:
     # Enable wiki for documentation
     wiki: false
diff --git a/README.md b/README.md
@@ -38,7 +38,7 @@ Projects are distributed across the code directory repositories:
 
 - [dubbo/api](./api). — Defines the component level APIs for the Dubbo control plane.
 
-- [dubbo/xds-api](https://github.com/dubbo-kubernetes/xds-api). — Define the xDS API for the Dubbo control plane.
+- [dubbo/xds-api](https://github.com/kdubbo/xds-api). — Define the xDS API for the Dubbo control plane.
 
 - [dubbo/client-go](./client-go). — Defines the Kubernetes clients automatically generated for Dubbo control plane resources.
 
diff --git a/dubbod/discovery/pkg/model/context.go b/dubbod/discovery/pkg/model/context.go
@@ -39,10 +39,10 @@ import (
 	"github.com/apache/dubbo-kubernetes/pkg/util/protomarshal"
 	"github.com/apache/dubbo-kubernetes/pkg/util/sets"
 	"github.com/apache/dubbo-kubernetes/pkg/xds"
-	// core "github.com/dubbo-inherent/xds-api/core/v1"
-	core "github.com/dubbo-inherent/xds-api/core/v1"
-	// discovery "github.com/dubbo-inherent/xds-api/service/discovery/v1"
-	discovery "github.com/dubbo-inherent/xds-api/service/discovery/v1"
+	// core "github.com/kdubbo/xds-api/core/v1"
+	core "github.com/kdubbo/xds-api/core/v1"
+	// discovery "github.com/kdubbo/xds-api/service/discovery/v1"
+	discovery "github.com/kdubbo/xds-api/service/discovery/v1"
 
 	"google.golang.org/protobuf/types/known/structpb"
 )
diff --git a/dubbod/discovery/pkg/model/typed_xds_cache.go b/dubbod/discovery/pkg/model/typed_xds_cache.go
@@ -24,9 +24,9 @@ import (
 	"github.com/apache/dubbo-kubernetes/dubbod/discovery/pkg/features"
 	"github.com/apache/dubbo-kubernetes/pkg/slices"
 	"github.com/apache/dubbo-kubernetes/pkg/util/sets"
-	// discovery "github.com/dubbo-inherent/xds-api/service/discovery/v1"
-	discovery "github.com/dubbo-inherent/xds-api/service/discovery/v1"
 	"github.com/hashicorp/golang-lru/v2/simplelru"
+	// discovery "github.com/kdubbo/xds-api/service/discovery/v1"
+	discovery "github.com/kdubbo/xds-api/service/discovery/v1"
 )
 
 type CacheToken uint64
diff --git a/dubbod/discovery/pkg/model/xds_cache.go b/dubbod/discovery/pkg/model/xds_cache.go
@@ -22,8 +22,8 @@ import (
 	"github.com/apache/dubbo-kubernetes/dubbod/discovery/pkg/features"
 	"github.com/apache/dubbo-kubernetes/pkg/config/schema/kind"
 	"github.com/apache/dubbo-kubernetes/pkg/util/sets"
-	// discovery "github.com/dubbo-inherent/xds-api/service/discovery/v1"
-	discovery "github.com/dubbo-inherent/xds-api/service/discovery/v1"
+	// discovery "github.com/kdubbo/xds-api/service/discovery/v1"
+	discovery "github.com/kdubbo/xds-api/service/discovery/v1"
 )
 
 type XdsCacheImpl struct {
diff --git a/dubbod/discovery/pkg/networking/grpcgen/cds.go b/dubbod/discovery/pkg/networking/grpcgen/cds.go
@@ -21,16 +21,16 @@ import (
 	"strings"
 
 	"github.com/apache/dubbo-kubernetes/dubbod/discovery/pkg/util/protoconv"
-	discovery "github.com/dubbo-inherent/xds-api/service/discovery/v1"
+	discovery "github.com/kdubbo/xds-api/service/discovery/v1"
 
 	networking "github.com/apache/dubbo-kubernetes/api/networking/v1alpha3"
 	"github.com/apache/dubbo-kubernetes/dubbod/discovery/pkg/model"
 	"github.com/apache/dubbo-kubernetes/dubbod/discovery/pkg/networking/util"
 	"github.com/apache/dubbo-kubernetes/pkg/config/host"
 	"github.com/apache/dubbo-kubernetes/pkg/util/sets"
-	cluster "github.com/dubbo-inherent/xds-api/cluster/v1"
-	core "github.com/dubbo-inherent/xds-api/core/v1"
-	tlsv1 "github.com/dubbo-inherent/xds-api/extensions/transport_sockets/tls/v1"
+	cluster "github.com/kdubbo/xds-api/cluster/v1"
+	core "github.com/kdubbo/xds-api/core/v1"
+	tlsv1 "github.com/kdubbo/xds-api/extensions/transport_sockets/tls/v1"
 )
 
 type clusterBuilder struct {
diff --git a/dubbod/discovery/pkg/networking/grpcgen/grpcgen.go b/dubbod/discovery/pkg/networking/grpcgen/grpcgen.go
@@ -20,7 +20,7 @@ import (
 	"github.com/apache/dubbo-kubernetes/dubbod/discovery/pkg/model"
 	v1 "github.com/apache/dubbo-kubernetes/dubbod/discovery/pkg/xds/v1"
 	dubbolog "github.com/apache/dubbo-kubernetes/pkg/log"
-	tlsv1 "github.com/dubbo-inherent/xds-api/extensions/transport_sockets/tls/v1"
+	tlsv1 "github.com/kdubbo/xds-api/extensions/transport_sockets/tls/v1"
 )
 
 var log = dubbolog.RegisterScope("grpcgen", "xDS Generator for Proxyless gRPC")
diff --git a/dubbod/discovery/pkg/networking/grpcgen/lds.go b/dubbod/discovery/pkg/networking/grpcgen/lds.go
@@ -29,13 +29,13 @@ import (
 	"github.com/apache/dubbo-kubernetes/pkg/dubboagent/grpcxds"
 	"github.com/apache/dubbo-kubernetes/pkg/util/sets"
 	"github.com/apache/dubbo-kubernetes/pkg/wellknown"
-	core "github.com/dubbo-inherent/xds-api/core/v1"
-	routerv1 "github.com/dubbo-inherent/xds-api/extensions/filters/v1/http/router"
-	hcmv1 "github.com/dubbo-inherent/xds-api/extensions/filters/v1/network/http_connection_manager"
-	tlsv1 "github.com/dubbo-inherent/xds-api/extensions/transport_sockets/tls/v1"
-	listener "github.com/dubbo-inherent/xds-api/listener/v1"
-	route "github.com/dubbo-inherent/xds-api/route/v1"
-	discovery "github.com/dubbo-inherent/xds-api/service/discovery/v1"
+	core "github.com/kdubbo/xds-api/core/v1"
+	routerv1 "github.com/kdubbo/xds-api/extensions/filters/v1/http/router"
+	hcmv1 "github.com/kdubbo/xds-api/extensions/filters/v1/network/http_connection_manager"
+	tlsv1 "github.com/kdubbo/xds-api/extensions/transport_sockets/tls/v1"
+	listener "github.com/kdubbo/xds-api/listener/v1"
+	route "github.com/kdubbo/xds-api/route/v1"
+	discovery "github.com/kdubbo/xds-api/service/discovery/v1"
 	wrapperspb "google.golang.org/protobuf/types/known/wrapperspb"
 )
 
diff --git a/dubbod/discovery/pkg/networking/grpcgen/rds.go b/dubbod/discovery/pkg/networking/grpcgen/rds.go
@@ -22,14 +22,14 @@ import (
 	"strings"
 
 	"github.com/apache/dubbo-kubernetes/dubbod/discovery/pkg/util/protoconv"
-	discovery "github.com/dubbo-inherent/xds-api/service/discovery/v1"
+	discovery "github.com/kdubbo/xds-api/service/discovery/v1"
 
 	networking "github.com/apache/dubbo-kubernetes/api/networking/v1alpha3"
 	"github.com/apache/dubbo-kubernetes/dubbod/discovery/pkg/model"
 	"github.com/apache/dubbo-kubernetes/pkg/config"
 	"github.com/apache/dubbo-kubernetes/pkg/config/host"
-	route "github.com/dubbo-inherent/xds-api/route/v1"
-	matcher "github.com/dubbo-inherent/xds-api/type/matcher/v1"
+	route "github.com/kdubbo/xds-api/route/v1"
+	matcher "github.com/kdubbo/xds-api/type/matcher/v1"
 	"google.golang.org/protobuf/types/known/wrapperspb"
 	sigsk8siogatewayapiapisv1 "sigs.k8s.io/gateway-api/apis/v1"
 )
diff --git a/dubbod/discovery/pkg/networking/util/util.go b/dubbod/discovery/pkg/networking/util/util.go
@@ -22,8 +22,8 @@ import (
 	"strings"
 
 	"github.com/apache/dubbo-kubernetes/dubbod/discovery/pkg/model"
-	core "github.com/dubbo-inherent/xds-api/core/v1"
-	listener "github.com/dubbo-inherent/xds-api/listener/v1"
+	core "github.com/kdubbo/xds-api/core/v1"
+	listener "github.com/kdubbo/xds-api/listener/v1"
 )
 
 const (
diff --git a/dubbod/discovery/pkg/xds/ads.go b/dubbod/discovery/pkg/xds/ads.go
@@ -29,8 +29,8 @@ import (
 	v1 "github.com/apache/dubbo-kubernetes/dubbod/discovery/pkg/xds/v1"
 	"github.com/apache/dubbo-kubernetes/pkg/util/sets"
 	"github.com/apache/dubbo-kubernetes/pkg/xds"
-	core "github.com/dubbo-inherent/xds-api/core/v1"
-	discovery "github.com/dubbo-inherent/xds-api/service/discovery/v1"
+	core "github.com/kdubbo/xds-api/core/v1"
+	discovery "github.com/kdubbo/xds-api/service/discovery/v1"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/peer"
 	"google.golang.org/grpc/status"
diff --git a/dubbod/discovery/pkg/xds/delta.go b/dubbod/discovery/pkg/xds/delta.go
@@ -25,8 +25,8 @@ import (
 	"github.com/apache/dubbo-kubernetes/dubbod/discovery/pkg/model"
 	v1 "github.com/apache/dubbo-kubernetes/dubbod/discovery/pkg/xds/v1"
 	"github.com/apache/dubbo-kubernetes/pkg/util/sets"
-	discovery "github.com/dubbo-inherent/xds-api/service/discovery/v1"
 	"github.com/google/uuid"
+	discovery "github.com/kdubbo/xds-api/service/discovery/v1"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/peer"
 	"google.golang.org/grpc/status"
diff --git a/dubbod/discovery/pkg/xds/discovery.go b/dubbod/discovery/pkg/xds/discovery.go
@@ -30,7 +30,7 @@ import (
 	"github.com/apache/dubbo-kubernetes/pkg/cluster"
 	"github.com/apache/dubbo-kubernetes/pkg/config/schema/kind"
 	"github.com/apache/dubbo-kubernetes/pkg/kube/krt"
-	discovery "github.com/dubbo-inherent/xds-api/service/discovery/v1"
+	discovery "github.com/kdubbo/xds-api/service/discovery/v1"
 	"go.uber.org/atomic"
 	"golang.org/x/time/rate"
 	"google.golang.org/grpc"
diff --git a/dubbod/discovery/pkg/xds/eds.go b/dubbod/discovery/pkg/xds/eds.go
@@ -24,8 +24,8 @@ import (
 	"github.com/apache/dubbo-kubernetes/dubbod/discovery/pkg/xds/endpoints"
 	"github.com/apache/dubbo-kubernetes/pkg/config/schema/kind"
 	"github.com/apache/dubbo-kubernetes/pkg/util/sets"
-	endpoint "github.com/dubbo-inherent/xds-api/endpoint/v1"
-	discovery "github.com/dubbo-inherent/xds-api/service/discovery/v1"
+	endpoint "github.com/kdubbo/xds-api/endpoint/v1"
+	discovery "github.com/kdubbo/xds-api/service/discovery/v1"
 )
 
 type EdsGenerator struct {
diff --git a/dubbod/discovery/pkg/xds/endpoints/endpoint_builder.go b/dubbod/discovery/pkg/xds/endpoints/endpoint_builder.go
@@ -25,10 +25,10 @@ import (
 	"github.com/apache/dubbo-kubernetes/pkg/config/labels"
 	dubbolog "github.com/apache/dubbo-kubernetes/pkg/log"
 	"github.com/cespare/xxhash/v2"
-	// core "github.com/dubbo-inherent/xds-api/core/v1"
-	core "github.com/dubbo-inherent/xds-api/core/v1"
-	// endpoint "github.com/dubbo-inherent/xds-api/endpoint/v1"
-	endpoint "github.com/dubbo-inherent/xds-api/endpoint/v1"
+	// core "github.com/kdubbo/xds-api/core/v1"
+	core "github.com/kdubbo/xds-api/core/v1"
+	// endpoint "github.com/kdubbo/xds-api/endpoint/v1"
+	endpoint "github.com/kdubbo/xds-api/endpoint/v1"
 
 	"google.golang.org/protobuf/types/known/wrapperspb"
 )
diff --git a/dubbod/discovery/pkg/xds/xdsgen.go b/dubbod/discovery/pkg/xds/xdsgen.go
@@ -31,11 +31,11 @@ import (
 	"github.com/apache/dubbo-kubernetes/pkg/util/sets"
 	dubboversion "github.com/apache/dubbo-kubernetes/pkg/version"
 	"github.com/apache/dubbo-kubernetes/pkg/xds"
-	cluster "github.com/dubbo-inherent/xds-api/cluster/v1"
-	core "github.com/dubbo-inherent/xds-api/core/v1"
-	hcmv1 "github.com/dubbo-inherent/xds-api/extensions/filters/v1/network/http_connection_manager"
-	listener "github.com/dubbo-inherent/xds-api/listener/v1"
-	discovery "github.com/dubbo-inherent/xds-api/service/discovery/v1"
+	cluster "github.com/kdubbo/xds-api/cluster/v1"
+	core "github.com/kdubbo/xds-api/core/v1"
+	hcmv1 "github.com/kdubbo/xds-api/extensions/filters/v1/network/http_connection_manager"
+	listener "github.com/kdubbo/xds-api/listener/v1"
+	discovery "github.com/kdubbo/xds-api/service/discovery/v1"
 )
 
 type DubboControlPlaneInstance struct {
diff --git a/dubbod/security/pkg/nodeagent/sds/sdsservice.go b/dubbod/security/pkg/nodeagent/sds/sdsservice.go
@@ -27,9 +27,9 @@ import (
 	"github.com/apache/dubbo-kubernetes/pkg/security"
 	"github.com/apache/dubbo-kubernetes/pkg/util/sets"
 	"github.com/apache/dubbo-kubernetes/pkg/xds"
-	core "github.com/dubbo-inherent/xds-api/core/v1"
-	discovery "github.com/dubbo-inherent/xds-api/service/discovery/v1"
-	sds "github.com/dubbo-inherent/xds-api/service/secret/v1"
+	core "github.com/kdubbo/xds-api/core/v1"
+	discovery "github.com/kdubbo/xds-api/service/discovery/v1"
+	sds "github.com/kdubbo/xds-api/service/secret/v1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
@@ -40,6 +40,8 @@ var sdsServiceLog = log.RegisterScope("sds", "SDS service debugging")
 var connectionNumber = int64(0)
 
 type sdsservice struct {
+	sds.UnimplementedSecretDiscoveryServiceServer
+
 	st security.SecretManager
 
 	stop       chan struct{}
diff --git a/go.mod b/go.mod
@@ -36,7 +36,6 @@ require (
 	github.com/docker/docker v27.5.1+incompatible
 	github.com/docker/docker-credential-helpers v0.9.3
 	github.com/docker/go-connections v0.5.0
-	github.com/dubbo-inherent/xds-api v0.0.0-20260319085810-1bb2ae75ee3e
 	github.com/evanphx/json-patch/v5 v5.9.11
 	github.com/fatih/color v1.18.0
 	github.com/fsnotify/fsnotify v1.9.0
@@ -57,6 +56,7 @@ require (
 	github.com/hashicorp/golang-lru/v2 v2.0.5
 	github.com/heroku/color v0.0.6
 	github.com/howardjohn/celpp v0.1.0
+	github.com/kdubbo/xds-api v0.0.0-20260320064637-6053c9f4bc27
 	github.com/moby/term v0.5.2
 	github.com/ory/viper v1.7.5
 	github.com/pkg/errors v0.9.1
@@ -73,8 +73,8 @@ require (
 	golang.org/x/time v0.12.0
 	gomodules.xyz/jsonpatch/v2 v2.5.0
 	google.golang.org/genproto/googleapis/api v0.0.0-20251202230838-ff82c1b0f217
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217
-	google.golang.org/grpc v1.79.1
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20260319201613-d00831a3d3e7
+	google.golang.org/grpc v1.79.3
 	google.golang.org/protobuf v1.36.11
 	gopkg.in/yaml.v3 v3.0.1
 	helm.sh/helm/v3 v3.18.6
diff --git a/go.sum b/go.sum
@@ -194,8 +194,6 @@ github.com/docker/go-metrics v0.0.1 h1:AgB/0SvBxihN0X8OR4SjsblXkbMvalQ8cjmtKQ2rQ
 github.com/docker/go-metrics v0.0.1/go.mod h1:cG1hvH2utMXtqgqqYE9plW6lDxS3/5ayHzueweSI3Vw=
 github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
 github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
-github.com/dubbo-inherent/xds-api v0.0.0-20260319085810-1bb2ae75ee3e h1:dyWR9ZqjwATSajFRj7/C8wguoSDX+rDo1pIW6ZKIM6w=
-github.com/dubbo-inherent/xds-api v0.0.0-20260319085810-1bb2ae75ee3e/go.mod h1:D/kb7KAj7fdRwjEWKKsnyZNfeAFPfaOK4/eH2lG4l9c=
 github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
 github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
 github.com/elazarl/goproxy v1.2.3 h1:xwIyKHbaP5yfT6O9KIeYJR5549MXRQkoQMRXGztz8YQ=
@@ -360,6 +358,8 @@ github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHm
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs=
 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8=
+github.com/kdubbo/xds-api v0.0.0-20260320064637-6053c9f4bc27 h1:k/TocMoUpZjxy9Iv9j8XGjobs3hI06Hz0u6azpOY9CE=
+github.com/kdubbo/xds-api v0.0.0-20260320064637-6053c9f4bc27/go.mod h1:o2HDUgL1ntaDbWomZ4cD2tt8jBamuG2qRtjXOa1zZ0Q=
 github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4=
 github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
@@ -740,15 +740,15 @@ google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98
 google.golang.org/genproto v0.0.0-20200423170343-7949de9c1215/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/genproto/googleapis/api v0.0.0-20251202230838-ff82c1b0f217 h1:fCvbg86sFXwdrl5LgVcTEvNC+2txB5mgROGmRL5mrls=
 google.golang.org/genproto/googleapis/api v0.0.0-20251202230838-ff82c1b0f217/go.mod h1:+rXWjjaukWZun3mLfjmVnQi18E1AsFbDN9QdJ5YXLto=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217 h1:gRkg/vSppuSQoDjxyiGfN4Upv/h/DQmIR10ZU8dh4Ww=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20260319201613-d00831a3d3e7 h1:ndE4FoJqsIceKP2oYSnUZqhTdYufCYYkqwtFzfrhI7w=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20260319201613-d00831a3d3e7/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
 google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
-google.golang.org/grpc v1.79.1 h1:zGhSi45ODB9/p3VAawt9a+O/MULLl9dpizzNNpq7flY=
-google.golang.org/grpc v1.79.1/go.mod h1:KmT0Kjez+0dde/v2j9vzwoAScgEPx/Bw1CYChhHLrHQ=
+google.golang.org/grpc v1.79.3 h1:sybAEdRIEtvcD68Gx7dmnwjZKlyfuc61Dyo9pGXXkKE=
+google.golang.org/grpc v1.79.3/go.mod h1:KmT0Kjez+0dde/v2j9vzwoAScgEPx/Bw1CYChhHLrHQ=
 google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE=
 google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
diff --git a/pkg/adsc/adsc.go b/pkg/adsc/adsc.go
@@ -38,11 +38,11 @@ import (
 	"github.com/apache/dubbo-kubernetes/pkg/security"
 	"github.com/apache/dubbo-kubernetes/pkg/util/protomarshal"
 	"github.com/apache/dubbo-kubernetes/pkg/wellknown"
-	cluster "github.com/dubbo-inherent/xds-api/cluster/v1"
-	endpoint "github.com/dubbo-inherent/xds-api/endpoint/v1"
-	listener "github.com/dubbo-inherent/xds-api/listener/v1"
-	route "github.com/dubbo-inherent/xds-api/route/v1"
-	discovery "github.com/dubbo-inherent/xds-api/service/discovery/v1"
+	cluster "github.com/kdubbo/xds-api/cluster/v1"
+	endpoint "github.com/kdubbo/xds-api/endpoint/v1"
+	listener "github.com/kdubbo/xds-api/listener/v1"
+	route "github.com/kdubbo/xds-api/route/v1"
+	discovery "github.com/kdubbo/xds-api/service/discovery/v1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
 	"google.golang.org/grpc/credentials/insecure"
diff --git a/pkg/bootstrap/config.go b/pkg/bootstrap/config.go
@@ -28,7 +28,7 @@ import (
 	"github.com/apache/dubbo-kubernetes/pkg/config/constants"
 	"github.com/apache/dubbo-kubernetes/pkg/model"
 	"github.com/apache/dubbo-kubernetes/pkg/security"
-	core "github.com/dubbo-inherent/xds-api/core/v1"
+	core "github.com/kdubbo/xds-api/core/v1"
 
 	dubbolog "github.com/apache/dubbo-kubernetes/pkg/log"
 )
diff --git a/pkg/dubboagent/agent.go b/pkg/dubboagent/agent.go
@@ -43,7 +43,7 @@ import (
 	"github.com/apache/dubbo-kubernetes/pkg/filewatcher"
 	"github.com/apache/dubbo-kubernetes/pkg/pixiu"
 	"github.com/apache/dubbo-kubernetes/pkg/security"
-	core "github.com/dubbo-inherent/xds-api/core/v1"
+	core "github.com/kdubbo/xds-api/core/v1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"
 	"google.golang.org/protobuf/types/known/structpb"
diff --git a/pkg/dubboagent/grpcxds/grpc_bootstrap.go b/pkg/dubboagent/grpcxds/grpc_bootstrap.go
@@ -28,7 +28,7 @@ import (
 	"github.com/apache/dubbo-kubernetes/pkg/model"
 
 	"github.com/apache/dubbo-kubernetes/pkg/util/protomarshal"
-	core "github.com/dubbo-inherent/xds-api/core/v1"
+	core "github.com/kdubbo/xds-api/core/v1"
 	"google.golang.org/protobuf/types/known/durationpb"
 	"google.golang.org/protobuf/types/known/structpb"
 )
diff --git a/pkg/dubboagent/xds_proxy.go b/pkg/dubboagent/xds_proxy.go
@@ -36,12 +36,12 @@ import (
 	"github.com/apache/dubbo-kubernetes/pkg/model"
 	"github.com/apache/dubbo-kubernetes/pkg/pixiu"
 	"github.com/apache/dubbo-kubernetes/pkg/uds"
-	cluster "github.com/dubbo-inherent/xds-api/cluster/v1"
-	core "github.com/dubbo-inherent/xds-api/core/v1"
-	endpoint "github.com/dubbo-inherent/xds-api/endpoint/v1"
-	listener "github.com/dubbo-inherent/xds-api/listener/v1"
-	route "github.com/dubbo-inherent/xds-api/route/v1"
-	discovery "github.com/dubbo-inherent/xds-api/service/discovery/v1"
+	cluster "github.com/kdubbo/xds-api/cluster/v1"
+	core "github.com/kdubbo/xds-api/core/v1"
+	endpoint "github.com/kdubbo/xds-api/endpoint/v1"
+	listener "github.com/kdubbo/xds-api/listener/v1"
+	route "github.com/kdubbo/xds-api/route/v1"
+	discovery "github.com/kdubbo/xds-api/service/discovery/v1"
 	"go.uber.org/atomic"
 	google_rpc "google.golang.org/genproto/googleapis/rpc/status"
 	"google.golang.org/grpc"
@@ -93,6 +93,8 @@ type ProxyConnection struct {
 }
 
 type XdsProxy struct {
+	discovery.UnimplementedAggregatedDiscoveryServiceServer
+
 	stopChan                  chan struct{}
 	downstreamGrpcServer      *grpc.Server
 	downstreamListener        net.Listener
diff --git a/pkg/dubboagent/xds_proxy_delta.go b/pkg/dubboagent/xds_proxy_delta.go
@@ -23,8 +23,8 @@ import (
 
 	"github.com/apache/dubbo-kubernetes/pkg/channels"
 	"github.com/apache/dubbo-kubernetes/pkg/model"
-	core "github.com/dubbo-inherent/xds-api/core/v1"
-	discovery "github.com/dubbo-inherent/xds-api/service/discovery/v1"
+	core "github.com/kdubbo/xds-api/core/v1"
+	discovery "github.com/kdubbo/xds-api/service/discovery/v1"
 	"go.uber.org/atomic"
 	google_rpc "google.golang.org/genproto/googleapis/rpc/status"
 	"google.golang.org/grpc"
diff --git a/pkg/model/proxy.go b/pkg/model/proxy.go
@@ -20,7 +20,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"github.com/apache/dubbo-kubernetes/pkg/cluster"
-	core "github.com/dubbo-inherent/xds-api/core/v1"
+	core "github.com/kdubbo/xds-api/core/v1"
 	"strconv"
 
 	meshv1alpha1 "github.com/apache/dubbo-kubernetes/api/mesh/v1alpha1"
diff --git a/pkg/pixiu/converter.go b/pkg/pixiu/converter.go
diff --git a/pkg/xds/server.go b/pkg/xds/server.go

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ import (`
`20`	`20`	`"github.com/apache/dubbo-kubernetes/dubbod/discovery/pkg/model"`
`21`	`21`	`v1 "github.com/apache/dubbo-kubernetes/dubbod/discovery/pkg/xds/v1"`
`22`	`22`	`dubbolog "github.com/apache/dubbo-kubernetes/pkg/log"`
`23`		`- tlsv1 "github.com/dubbo-inherent/xds-api/extensions/transport_sockets/tls/v1"`
	`23`	`+ tlsv1 "github.com/kdubbo/xds-api/extensions/transport_sockets/tls/v1"`
`24`	`24`	`)`
`25`	`25`
`26`	`26`	`var log = dubbolog.RegisterScope("grpcgen", "xDS Generator for Proxyless gRPC")`
Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,8 @@ import (`
`22`	`22`	`"strings"`
`23`	`23`
`24`	`24`	`"github.com/apache/dubbo-kubernetes/dubbod/discovery/pkg/model"`
`25`		`- core "github.com/dubbo-inherent/xds-api/core/v1"`
`26`		`- listener "github.com/dubbo-inherent/xds-api/listener/v1"`
	`25`	`+ core "github.com/kdubbo/xds-api/core/v1"`
	`26`	`+ listener "github.com/kdubbo/xds-api/listener/v1"`
`27`	`27`	`)`
`28`	`28`
`29`	`29`	`const (`