Skip to content

Update import #878

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mfordjody merged 1 commit into from
Mar 19, 2026
Merged

Update import #878

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .asf.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
8 changes: 4 additions & 4 deletions dubbod/discovery/pkg/model/context.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
4 changes: 2 additions & 2 deletions dubbod/discovery/pkg/model/typed_xds_cache.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
4 changes: 2 additions & 2 deletions dubbod/discovery/pkg/model/xds_cache.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
8 changes: 4 additions & 4 deletions dubbod/discovery/pkg/networking/grpcgen/cds.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion dubbod/discovery/pkg/networking/grpcgen/grpcgen.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
14 changes: 7 additions & 7 deletions dubbod/discovery/pkg/networking/grpcgen/lds.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
6 changes: 3 additions & 3 deletions dubbod/discovery/pkg/networking/grpcgen/rds.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
4 changes: 2 additions & 2 deletions dubbod/discovery/pkg/networking/util/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
4 changes: 2 additions & 2 deletions dubbod/discovery/pkg/xds/ads.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion dubbod/discovery/pkg/xds/delta.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion dubbod/discovery/pkg/xds/discovery.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions dubbod/discovery/pkg/xds/eds.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
8 changes: 4 additions & 4 deletions dubbod/discovery/pkg/xds/endpoints/endpoint_builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
10 changes: 5 additions & 5 deletions dubbod/discovery/pkg/xds/xdsgen.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions dubbod/security/pkg/nodeagent/sds/sdsservice.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
"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"
Expand Down Expand Up @@ -124,7 +124,7 @@

// register adds the SDS handle to the grpc server
func (s *sdsservice) register(rpcs *grpc.Server) {
sds.RegisterSecretDiscoveryServiceServer(rpcs, s)

Check failure on line 127 in dubbod/security/pkg/nodeagent/sds/sdsservice.go

View workflow job for this annotation

GitHub Actions / Go Build (ubuntu-latest) 

cannot use s (variable of type *sdsservice) as secretv1.SecretDiscoveryServiceServer value in argument to sds.RegisterSecretDiscoveryServiceServer: *sdsservice does not implement secretv1.SecretDiscoveryServiceServer (missing method mustEmbedUnimplementedSecretDiscoveryServiceServer)

Check failure on line 127 in dubbod/security/pkg/nodeagent/sds/sdsservice.go

View workflow job for this annotation

GitHub Actions / Go Unit Tests 

cannot use s (variable of type *sdsservice) as secretv1.SecretDiscoveryServiceServer value in argument to sds.RegisterSecretDiscoveryServiceServer: *sdsservice does not implement secretv1.SecretDiscoveryServiceServer (missing method mustEmbedUnimplementedSecretDiscoveryServiceServer)
}

func (s *sdsservice) generate(resourceNames []string) (*discovery.DiscoveryResponse, error) {
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 2 additions & 4 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down
10 changes: 5 additions & 5 deletions pkg/adsc/adsc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion pkg/bootstrap/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/dubboagent/agent.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion pkg/dubboagent/grpcxds/grpc_bootstrap.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
12 changes: 6 additions & 6 deletions pkg/dubboagent/xds_proxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@
"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"
Expand Down Expand Up @@ -645,7 +645,7 @@
opts := p.downstreamGrpcOptions
opts = append(opts, dubbogrpc.ServerOptions(dubbokeepalive.DefaultOption())...)
grpcs := grpc.NewServer(opts...)
discovery.RegisterAggregatedDiscoveryServiceServer(grpcs, p)

Check failure on line 648 in pkg/dubboagent/xds_proxy.go

View workflow job for this annotation

GitHub Actions / Go Build (ubuntu-latest) 

cannot use p (variable of type *XdsProxy) as discoveryv1.AggregatedDiscoveryServiceServer value in argument to discovery.RegisterAggregatedDiscoveryServiceServer: *XdsProxy does not implement discoveryv1.AggregatedDiscoveryServiceServer (missing method mustEmbedUnimplementedAggregatedDiscoveryServiceServer)

Check failure on line 648 in pkg/dubboagent/xds_proxy.go

View workflow job for this annotation

GitHub Actions / Go Unit Tests 

cannot use p (variable of type *XdsProxy) as discoveryv1.AggregatedDiscoveryServiceServer value in argument to discovery.RegisterAggregatedDiscoveryServiceServer: *XdsProxy does not implement discoveryv1.AggregatedDiscoveryServiceServer (missing method mustEmbedUnimplementedAggregatedDiscoveryServiceServer)
reflection.Register(grpcs)
p.downstreamGrpcServer = grpcs
p.downstreamListener = l
Expand Down
4 changes: 2 additions & 2 deletions pkg/dubboagent/xds_proxy_delta.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion pkg/model/proxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
10 changes: 5 additions & 5 deletions pkg/pixiu/converter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
4 changes: 2 additions & 2 deletions pkg/xds/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading