This is an automated email from the ASF dual-hosted git repository.
zhongxjian pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-kubernetes.git
The following commit(s) were added to refs/heads/master by this push:
new bf0e45a1 Update import (#878)
bf0e45a1 is described below
commit bf0e45a180c4953cdf7923b49ae3f48693eb80b0
Author: Joe Zhong <[email protected]>
AuthorDate: Fri Mar 20 02:12:06 2026 +0800
Update import (#878)
---
.asf.yaml | 4 ++--
README.md | 5 ++---
dubbod/discovery/pkg/model/context.go | 8 ++++----
dubbod/discovery/pkg/model/typed_xds_cache.go | 4 ++--
dubbod/discovery/pkg/model/xds_cache.go | 4 ++--
dubbod/discovery/pkg/networking/grpcgen/cds.go | 8 ++++----
dubbod/discovery/pkg/networking/grpcgen/grpcgen.go | 2 +-
dubbod/discovery/pkg/networking/grpcgen/lds.go | 14 +++++++-------
dubbod/discovery/pkg/networking/grpcgen/rds.go | 6 +++---
dubbod/discovery/pkg/networking/util/util.go | 4 ++--
dubbod/discovery/pkg/xds/ads.go | 4 ++--
dubbod/discovery/pkg/xds/delta.go | 2 +-
dubbod/discovery/pkg/xds/discovery.go | 2 +-
dubbod/discovery/pkg/xds/eds.go | 4 ++--
dubbod/discovery/pkg/xds/endpoints/endpoint_builder.go | 8 ++++----
dubbod/discovery/pkg/xds/xdsgen.go | 10 +++++-----
dubbod/security/pkg/nodeagent/sds/sdsservice.go | 6 +++---
go.mod | 2 +-
go.sum | 6 ++----
pkg/adsc/adsc.go | 10 +++++-----
pkg/bootstrap/config.go | 2 +-
pkg/dubboagent/agent.go | 2 +-
pkg/dubboagent/grpcxds/grpc_bootstrap.go | 2 +-
pkg/dubboagent/xds_proxy.go | 12 ++++++------
pkg/dubboagent/xds_proxy_delta.go | 4 ++--
pkg/model/proxy.go | 2 +-
pkg/pixiu/converter.go | 10 +++++-----
pkg/xds/server.go | 4 ++--
28 files changed, 74 insertions(+), 77 deletions(-)
diff --git a/.asf.yaml b/.asf.yaml
index 3e008c37..3f0c5de1 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -20,8 +20,8 @@ notifications:
jira_options: link label
github:
- homepage: "https://dubbo-kubernetes.github.io/";
- description: "Dubbo Service Mesh for Kubernetes."
+ homepage: "https://dubbo-inherent.github.io/";
+ description: "Dubbo Inherent Mesh for Kubernetes."
features:
# Enable wiki for documentation
wiki: false
diff --git a/README.md b/README.md
index 865f1393..1cbb0c72 100644
--- a/README.md
+++ b/README.md
@@ -17,10 +17,9 @@
<img src="https://img.shields.io/badge/license-Apache--2.0-green.svg"; />
</p>
-<h2 align="center">Dubbo Service Mesh for Kubernetes</h2>
+<h2 align="center">Dubbo Inherent Mesh for Kubernetes</h2>
-Dubbo gRPC open source service mesh implemented for the underlying cluster
management platform can directly receive policies from the control plane and
obtain features such as load balancing, service discovery, and observability
without requiring a sidecar proxy.
-- For more detailed information on how to use it, please visit
[dubbo-kubernetes.io](https://dubbo-kubernetes.github.io/)
+Dubbo inherent mesh implemented for the underlying cluster management platform
can directly receive policies from the control plane and obtain features such
as load balancing, service discovery, and observability without requiring a
sidecar proxy.
## Introduction
diff --git a/dubbod/discovery/pkg/model/context.go
b/dubbod/discovery/pkg/model/context.go
index f7fb536c..b8825722 100644
--- 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-kubernetes/xds-api/core/v1"
- core "github.com/dubbo-kubernetes/xds-api/core/v1"
- // discovery "github.com/dubbo-kubernetes/xds-api/service/discovery/v1"
- discovery "github.com/dubbo-kubernetes/xds-api/service/discovery/v1"
+ // 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"
"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
index 907e09d2..1ab63ff0 100644
--- a/dubbod/discovery/pkg/model/typed_xds_cache.go
+++ b/dubbod/discovery/pkg/model/typed_xds_cache.go
@@ -24,8 +24,8 @@ 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-kubernetes/xds-api/service/discovery/v1"
- discovery "github.com/dubbo-kubernetes/xds-api/service/discovery/v1"
+ // 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"
)
diff --git a/dubbod/discovery/pkg/model/xds_cache.go
b/dubbod/discovery/pkg/model/xds_cache.go
index 9466239f..2a4ca3d3 100644
--- 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-kubernetes/xds-api/service/discovery/v1"
- discovery "github.com/dubbo-kubernetes/xds-api/service/discovery/v1"
+ // discovery "github.com/dubbo-inherent/xds-api/service/discovery/v1"
+ discovery "github.com/dubbo-inherent/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
index 096bc5cc..95cf93e4 100644
--- 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-kubernetes/xds-api/service/discovery/v1"
+ discovery "github.com/dubbo-inherent/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-kubernetes/xds-api/cluster/v1"
- core "github.com/dubbo-kubernetes/xds-api/core/v1"
- tlsv1
"github.com/dubbo-kubernetes/xds-api/extensions/transport_sockets/tls/v1"
+ 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"
)
type clusterBuilder struct {
diff --git a/dubbod/discovery/pkg/networking/grpcgen/grpcgen.go
b/dubbod/discovery/pkg/networking/grpcgen/grpcgen.go
index 47d0419c..043cf884 100644
--- 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-kubernetes/xds-api/extensions/transport_sockets/tls/v1"
+ tlsv1
"github.com/dubbo-inherent/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
index 3361ae26..dec8f337 100644
--- 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-kubernetes/xds-api/core/v1"
- routerv1
"github.com/dubbo-kubernetes/xds-api/extensions/filters/v1/http/router"
- hcmv1
"github.com/dubbo-kubernetes/xds-api/extensions/filters/v1/network/http_connection_manager"
- tlsv1
"github.com/dubbo-kubernetes/xds-api/extensions/transport_sockets/tls/v1"
- listener "github.com/dubbo-kubernetes/xds-api/listener/v1"
- route "github.com/dubbo-kubernetes/xds-api/route/v1"
- discovery "github.com/dubbo-kubernetes/xds-api/service/discovery/v1"
+ 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"
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
index c59ed7fe..6c5b198d 100644
--- 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-kubernetes/xds-api/service/discovery/v1"
+ discovery "github.com/dubbo-inherent/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-kubernetes/xds-api/route/v1"
- matcher "github.com/dubbo-kubernetes/xds-api/type/matcher/v1"
+ route "github.com/dubbo-inherent/xds-api/route/v1"
+ matcher "github.com/dubbo-inherent/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
index 6bc3b095..3344328c 100644
--- 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-kubernetes/xds-api/core/v1"
- listener "github.com/dubbo-kubernetes/xds-api/listener/v1"
+ core "github.com/dubbo-inherent/xds-api/core/v1"
+ listener "github.com/dubbo-inherent/xds-api/listener/v1"
)
const (
diff --git a/dubbod/discovery/pkg/xds/ads.go b/dubbod/discovery/pkg/xds/ads.go
index 82881ea9..623c61d6 100644
--- 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-kubernetes/xds-api/core/v1"
- discovery "github.com/dubbo-kubernetes/xds-api/service/discovery/v1"
+ core "github.com/dubbo-inherent/xds-api/core/v1"
+ discovery "github.com/dubbo-inherent/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
index 480ba9c9..5930d484 100644
--- a/dubbod/discovery/pkg/xds/delta.go
+++ b/dubbod/discovery/pkg/xds/delta.go
@@ -25,7 +25,7 @@ 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-kubernetes/xds-api/service/discovery/v1"
+ discovery "github.com/dubbo-inherent/xds-api/service/discovery/v1"
"github.com/google/uuid"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/peer"
diff --git a/dubbod/discovery/pkg/xds/discovery.go
b/dubbod/discovery/pkg/xds/discovery.go
index ea3f6725..627945e3 100644
--- 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-kubernetes/xds-api/service/discovery/v1"
+ discovery "github.com/dubbo-inherent/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
index 7b6b5977..7cd0292e 100644
--- 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-kubernetes/xds-api/endpoint/v1"
- discovery "github.com/dubbo-kubernetes/xds-api/service/discovery/v1"
+ endpoint "github.com/dubbo-inherent/xds-api/endpoint/v1"
+ discovery "github.com/dubbo-inherent/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
index b3b8155c..8dda5115 100644
--- 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-kubernetes/xds-api/core/v1"
- core "github.com/dubbo-kubernetes/xds-api/core/v1"
- // endpoint "github.com/dubbo-kubernetes/xds-api/endpoint/v1"
- endpoint "github.com/dubbo-kubernetes/xds-api/endpoint/v1"
+ // 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"
"google.golang.org/protobuf/types/known/wrapperspb"
)
diff --git a/dubbod/discovery/pkg/xds/xdsgen.go
b/dubbod/discovery/pkg/xds/xdsgen.go
index 1ec5fa02..163336a3 100644
--- 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-kubernetes/xds-api/cluster/v1"
- core "github.com/dubbo-kubernetes/xds-api/core/v1"
- hcmv1
"github.com/dubbo-kubernetes/xds-api/extensions/filters/v1/network/http_connection_manager"
- listener "github.com/dubbo-kubernetes/xds-api/listener/v1"
- discovery "github.com/dubbo-kubernetes/xds-api/service/discovery/v1"
+ 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"
)
type DubboControlPlaneInstance struct {
diff --git a/dubbod/security/pkg/nodeagent/sds/sdsservice.go
b/dubbod/security/pkg/nodeagent/sds/sdsservice.go
index 14bd0c20..c0b36a80 100644
--- 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-kubernetes/xds-api/core/v1"
- discovery "github.com/dubbo-kubernetes/xds-api/service/discovery/v1"
- sds "github.com/dubbo-kubernetes/xds-api/service/secret/v1"
+ 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"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
diff --git a/go.mod b/go.mod
index 0ae37ae6..52b7cfab 100644
--- a/go.mod
+++ b/go.mod
@@ -36,7 +36,7 @@ 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-kubernetes/xds-api v0.0.0-20260318022345-fca131fda8ec
+ 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
diff --git a/go.sum b/go.sum
index 7b4e662b..c4595494 100644
--- a/go.sum
+++ b/go.sum
@@ -194,10 +194,8 @@ 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-kubernetes/xds-api v0.0.0-20260228103100-7a9ab7bac3bb
h1:22gy5yN3itUL9himTcy8WaZVhVwikgDRIFLAiXgVmnY=
-github.com/dubbo-kubernetes/xds-api v0.0.0-20260228103100-7a9ab7bac3bb/go.mod
h1:Xt+Kec3dL9AS7D3GJnqdNVJUW17VlFauXVnjkK/hVU0=
-github.com/dubbo-kubernetes/xds-api v0.0.0-20260318022345-fca131fda8ec
h1:HnnmtgH5dbtK0KHaA4EV1sNBKIxxaeKGSXdrMPibNO8=
-github.com/dubbo-kubernetes/xds-api v0.0.0-20260318022345-fca131fda8ec/go.mod
h1:qTuiKuHP/sQnQ+iPG5LHcbg2YNW+MwK44YuoDKGuvfI=
+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=
diff --git a/pkg/adsc/adsc.go b/pkg/adsc/adsc.go
index d9c07075..ad1afacd 100644
--- 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-kubernetes/xds-api/cluster/v1"
- endpoint "github.com/dubbo-kubernetes/xds-api/endpoint/v1"
- listener "github.com/dubbo-kubernetes/xds-api/listener/v1"
- route "github.com/dubbo-kubernetes/xds-api/route/v1"
- discovery "github.com/dubbo-kubernetes/xds-api/service/discovery/v1"
+ 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"
"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
index e07d897e..ee28e4c6 100644
--- 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-kubernetes/xds-api/core/v1"
+ core "github.com/dubbo-inherent/xds-api/core/v1"
dubbolog "github.com/apache/dubbo-kubernetes/pkg/log"
)
diff --git a/pkg/dubboagent/agent.go b/pkg/dubboagent/agent.go
index 3f5c17f9..a97fa9c8 100644
--- 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-kubernetes/xds-api/core/v1"
+ core "github.com/dubbo-inherent/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
index 4723ea51..2529391e 100644
--- 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-kubernetes/xds-api/core/v1"
+ core "github.com/dubbo-inherent/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
index e75c6f0d..d9586f1c 100644
--- 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-kubernetes/xds-api/cluster/v1"
- core "github.com/dubbo-kubernetes/xds-api/core/v1"
- endpoint "github.com/dubbo-kubernetes/xds-api/endpoint/v1"
- listener "github.com/dubbo-kubernetes/xds-api/listener/v1"
- route "github.com/dubbo-kubernetes/xds-api/route/v1"
- discovery "github.com/dubbo-kubernetes/xds-api/service/discovery/v1"
+ 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"
"go.uber.org/atomic"
google_rpc "google.golang.org/genproto/googleapis/rpc/status"
"google.golang.org/grpc"
diff --git a/pkg/dubboagent/xds_proxy_delta.go
b/pkg/dubboagent/xds_proxy_delta.go
index 0c15767b..e777d1c7 100644
--- 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-kubernetes/xds-api/core/v1"
- discovery "github.com/dubbo-kubernetes/xds-api/service/discovery/v1"
+ core "github.com/dubbo-inherent/xds-api/core/v1"
+ discovery "github.com/dubbo-inherent/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
index fd666149..c5599375 100644
--- 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-kubernetes/xds-api/core/v1"
+ core "github.com/dubbo-inherent/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
index a2458cf9..4fa880ce 100644
--- a/pkg/pixiu/converter.go
+++ b/pkg/pixiu/converter.go
@@ -18,11 +18,11 @@ package pixiu
import (
"fmt"
- cluster "github.com/dubbo-kubernetes/xds-api/cluster/v1"
- endpoint "github.com/dubbo-kubernetes/xds-api/endpoint/v1"
- hcm
"github.com/dubbo-kubernetes/xds-api/extensions/filters/v1/network/http_connection_manager"
- listener "github.com/dubbo-kubernetes/xds-api/listener/v1"
- route "github.com/dubbo-kubernetes/xds-api/route/v1"
+ cluster "github.com/dubbo-inherent/xds-api/cluster/v1"
+ endpoint "github.com/dubbo-inherent/xds-api/endpoint/v1"
+ hcm
"github.com/dubbo-inherent/xds-api/extensions/filters/v1/network/http_connection_manager"
+ listener "github.com/dubbo-inherent/xds-api/listener/v1"
+ route "github.com/dubbo-inherent/xds-api/route/v1"
"gopkg.in/yaml.v3"
)
diff --git a/pkg/xds/server.go b/pkg/xds/server.go
index f0fc8e24..60282623 100644
--- a/pkg/xds/server.go
+++ b/pkg/xds/server.go
@@ -23,8 +23,8 @@ import (
dubbogrpc "github.com/apache/dubbo-kubernetes/dubbod/discovery/pkg/grpc"
"github.com/apache/dubbo-kubernetes/pkg/model"
"github.com/apache/dubbo-kubernetes/pkg/util/sets"
- core "github.com/dubbo-kubernetes/xds-api/core/v1"
- discovery "github.com/dubbo-kubernetes/xds-api/service/discovery/v1"
+ core "github.com/dubbo-inherent/xds-api/core/v1"
+ discovery "github.com/dubbo-inherent/xds-api/service/discovery/v1"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
"google.golang.org/protobuf/types/known/anypb"
![https://img.shields.io/badge/license-Apache--2.0-green.svg"](https://img.shields.io/badge/license-Apache--2.0-green.svg"){kind=link}