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 aedfc0d3 Rename planet to dubbo (#854)
aedfc0d3 is described below
commit aedfc0d3caa03c1dfae42e5ef370ee6b67c9a129
Author: mfordjody <[email protected]>
AuthorDate: Sun Jan 25 01:18:16 2026 +0800
Rename planet to dubbo (#854)
---
.github/ISSUE_TEMPLATE/feature-request.md | 5 +--
.github/PULL_REQUEST_TEMPLATE.md | 3 +-
api/kubernetes/customresourcedefinitions.gen.yaml | 6 +--
api/networking/v1alpha3/destination_rule.pb.go | 2 +-
api/networking/v1alpha3/destination_rule.proto | 2 +-
api/networking/v1alpha3/virtual_service.pb.go | 2 +-
api/networking/v1alpha3/virtual_service.proto | 2 +-
api/security/v1alpha3/peer_authentication.pb.go | 2 +-
api/security/v1alpha3/peer_authentication.proto | 2 +-
.../pkg/apis/networking/v1alpha3/types.gen.go | 4 +-
client-go/pkg/apis/security/v1alpha3/types.gen.go | 2 +-
dubbod/discovery/cmd/dubbo-agent/app/cmd.go | 6 +--
dubbod/discovery/cmd/dubbo-agent/config/config.go | 2 +-
.../cmd/dubbo-agent/options/agent_proxy.go | 4 +-
.../discovery/cmd/dubbo-agent/options/security.go | 2 +-
dubbod/discovery/cmd/dubbo-discover/app/cmd.go | 2 +-
dubbod/discovery/docker/dockerfile.planet | 4 +-
dubbod/discovery/docker/dockerfile.proxyadapter | 4 +-
dubbod/discovery/pkg/bootstrap/cert_controller.go | 4 +-
.../discovery/pkg/bootstrap/config_controller.go | 10 ++---
dubbod/discovery/pkg/bootstrap/options.go | 2 +-
dubbod/discovery/pkg/bootstrap/server.go | 48 +++++++++++-----------
dubbod/discovery/pkg/bootstrap/validation.go | 2 +-
dubbod/discovery/pkg/config/kube/crd/conversion.go | 2 +-
.../discovery/pkg/config/kube/crdclient/client.go | 8 ++--
.../discovery/pkg/config/kube/crdclient/types.go | 8 ++--
.../discovery/pkg/config/kube/file/controller.go | 2 +-
dubbod/discovery/pkg/features/experimental.go | 10 ++---
dubbod/discovery/pkg/features/planet.go | 12 +++---
dubbod/discovery/pkg/features/security.go | 4 +-
dubbod/discovery/pkg/features/tuning.go | 20 ++++-----
dubbod/discovery/pkg/features/xds.go | 12 +++---
.../kube/controller/multicluster.go | 4 +-
dubbod/discovery/pkg/xds/discovery.go | 1 -
go.sum | 24 +++++++++++
manifests/charts/base/files/crd-all.gen.yaml | 6 +--
.../dubbo-discovery/files/gateway.yaml | 2 +-
.../dubbo-discovery/files/grpc-agent.yaml | 4 +-
.../dubbo-discovery/templates/deployment.yaml | 2 +-
.../dubbo-control/dubbo-discovery/values.yaml | 2 +-
manifests/profiles/default.yaml | 2 +-
operator/pkg/apis/types.go | 6 +--
operator/pkg/component/component.go | 13 +++---
operator/pkg/install/installer.go | 4 +-
operator/pkg/uninstall/prune.go | 2 +-
pkg/adsc/adsc.go | 4 +-
pkg/bootstrap/config.go | 4 +-
pkg/config/constants/constants.go | 18 ++++----
pkg/config/schema/collections/collections.agent.go | 12 +++---
pkg/config/schema/collections/collections.go | 12 +++---
pkg/config/schema/collections/gateway.go | 4 +-
pkg/dubboagent/agent.go | 14 +++----
pkg/dubboagent/grpcxds/grpc_bootstrap.go | 2 +-
pkg/dubboagent/xds_proxy.go | 2 +-
pkg/dubboagent/xds_proxy_delta.go | 2 +-
pkg/model/proxy.go | 16 ++++----
pkg/security/security.go | 2 +-
tools/build-tools/docker/Dockerfile | 4 +-
58 files changed, 193 insertions(+), 175 deletions(-)
diff --git a/.github/ISSUE_TEMPLATE/feature-request.md
b/.github/ISSUE_TEMPLATE/feature-request.md
index ada6aa57..b54975de 100644
--- a/.github/ISSUE_TEMPLATE/feature-request.md
+++ b/.github/ISSUE_TEMPLATE/feature-request.md
@@ -26,12 +26,9 @@ assignees: ''
<!-- Please put an X in all that apply -->
-- [ ] Core Components
-- [ ] Control Plane (Planet Discovery)
-- [ ] Data Plane (Planet Agent)
+- [ ] Control Plane
- [ ] Operator
- [ ] Helm Charts
-- [ ] Documentation
- [ ] Installation
- [ ] Testing
- [ ] User Experience
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 8bddf5e9..a308c557 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -28,8 +28,7 @@ Related to #
<!-- Please put an X in all that apply -->
- [ ] Core Components
-- [ ] Control Plane (Planet Discovery)
-- [ ] Data Plane (Planet Agent)
+- [ ] Control Plane
- [ ] Operator
- [ ] Helm Charts
- [ ] Documentation
diff --git a/api/kubernetes/customresourcedefinitions.gen.yaml
b/api/kubernetes/customresourcedefinitions.gen.yaml
index 0c6c1dea..04730e6f 100644
--- a/api/kubernetes/customresourcedefinitions.gen.yaml
+++ b/api/kubernetes/customresourcedefinitions.gen.yaml
@@ -5,7 +5,7 @@ metadata:
annotations:
"helm.sh/resource-policy": keep
labels:
- app: dubbo-planet
+ app: dubbo
chart: dubbo
heritage: Tiller
release: dubbo
@@ -139,7 +139,7 @@ metadata:
annotations:
"helm.sh/resource-policy": keep
labels:
- app: dubbo-planet
+ app: dubbo
chart: dubbo
heritage: Tiller
release: dubbo
@@ -258,7 +258,7 @@ metadata:
annotations:
"helm.sh/resource-policy": keep
labels:
- app: dubbo-planet
+ app: dubbo
chart: dubbo
dubbo: security
heritage: Tiller
diff --git a/api/networking/v1alpha3/destination_rule.pb.go
b/api/networking/v1alpha3/destination_rule.pb.go
index b62f2a07..ffb639f3 100644
--- a/api/networking/v1alpha3/destination_rule.pb.go
+++ b/api/networking/v1alpha3/destination_rule.pb.go
@@ -100,7 +100,7 @@ func (ClientTLSSettings_TLSmode) EnumDescriptor() ([]byte,
[]int) {
// +cue-gen:DestinationRule:groupName:networking.dubbo.apache.org
// +cue-gen:DestinationRule:versions:v1alpha3
// +cue-gen:DestinationRule:annotations:helm.sh/resource-policy=keep
-//
+cue-gen:DestinationRule:labels:app=dubbo-planet,chart=dubbo,heritage=Tiller,release=dubbo
+//
+cue-gen:DestinationRule:labels:app=dubbo,chart=dubbo,heritage=Tiller,release=dubbo
// +cue-gen:DestinationRule:subresource:status
// +cue-gen:DestinationRule:scope:Namespaced
// +cue-gen:DestinationRule:resource:categories=dubbo,networking,shortNames=dr
diff --git a/api/networking/v1alpha3/destination_rule.proto
b/api/networking/v1alpha3/destination_rule.proto
index 64b62207..2222e89f 100644
--- a/api/networking/v1alpha3/destination_rule.proto
+++ b/api/networking/v1alpha3/destination_rule.proto
@@ -36,7 +36,7 @@ option go_package = "/api/networking/v1alpha3";
// +cue-gen:DestinationRule:groupName:networking.dubbo.apache.org
// +cue-gen:DestinationRule:versions:v1alpha3
// +cue-gen:DestinationRule:annotations:helm.sh/resource-policy=keep
-//
+cue-gen:DestinationRule:labels:app=dubbo-planet,chart=dubbo,heritage=Tiller,release=dubbo
+//
+cue-gen:DestinationRule:labels:app=dubbo,chart=dubbo,heritage=Tiller,release=dubbo
// +cue-gen:DestinationRule:subresource:status
// +cue-gen:DestinationRule:scope:Namespaced
// +cue-gen:DestinationRule:resource:categories=dubbo,networking,shortNames=dr
diff --git a/api/networking/v1alpha3/virtual_service.pb.go
b/api/networking/v1alpha3/virtual_service.pb.go
index c68f5aa5..d96b93e0 100644
--- a/api/networking/v1alpha3/virtual_service.pb.go
+++ b/api/networking/v1alpha3/virtual_service.pb.go
@@ -49,7 +49,7 @@ const (
// +cue-gen:VirtualService:groupName:networking.dubbo.apache.org
// +cue-gen:VirtualService:versions:v1alpha3
// +cue-gen:VirtualService:annotations:helm.sh/resource-policy=keep
-//
+cue-gen:VirtualService:labels:app=dubbo-planet,chart=dubbo,heritage=Tiller,release=dubbo
+//
+cue-gen:VirtualService:labels:app=dubbo,chart=dubbo,heritage=Tiller,release=dubbo
// +cue-gen:VirtualService:subresource:status
// +cue-gen:VirtualService:scope:Namespaced
// +cue-gen:VirtualService:resource:categories=dubbo,networking,shortNames=vs
diff --git a/api/networking/v1alpha3/virtual_service.proto
b/api/networking/v1alpha3/virtual_service.proto
index ef56c119..d50e10ae 100644
--- a/api/networking/v1alpha3/virtual_service.proto
+++ b/api/networking/v1alpha3/virtual_service.proto
@@ -34,7 +34,7 @@ option go_package = "/api/networking/v1alpha3";
// +cue-gen:VirtualService:groupName:networking.dubbo.apache.org
// +cue-gen:VirtualService:versions:v1alpha3
// +cue-gen:VirtualService:annotations:helm.sh/resource-policy=keep
-//
+cue-gen:VirtualService:labels:app=dubbo-planet,chart=dubbo,heritage=Tiller,release=dubbo
+//
+cue-gen:VirtualService:labels:app=dubbo,chart=dubbo,heritage=Tiller,release=dubbo
// +cue-gen:VirtualService:subresource:status
// +cue-gen:VirtualService:scope:Namespaced
// +cue-gen:VirtualService:resource:categories=dubbo,networking,shortNames=vs
diff --git a/api/security/v1alpha3/peer_authentication.pb.go
b/api/security/v1alpha3/peer_authentication.pb.go
index 1e8137d7..e6b1c763 100644
--- a/api/security/v1alpha3/peer_authentication.pb.go
+++ b/api/security/v1alpha3/peer_authentication.pb.go
@@ -99,7 +99,7 @@ func (PeerAuthentication_MutualTLS_Mode) EnumDescriptor()
([]byte, []int) {
// +cue-gen:PeerAuthentication:versions:v1alpha3
// +cue-gen:PeerAuthentication:storageVersion
// +cue-gen:PeerAuthentication:annotations:helm.sh/resource-policy=keep
-//
+cue-gen:PeerAuthentication:labels:app=dubbo-planet,chart=dubbo,dubbo=security,heritage=Tiller,release=dubbo
+//
+cue-gen:PeerAuthentication:labels:app=dubbo,chart=dubbo,dubbo=security,heritage=Tiller,release=dubbo
// +cue-gen:PeerAuthentication:subresource:status
// +cue-gen:PeerAuthentication:scope:Namespaced
// +cue-gen:PeerAuthentication:resource:categories=dubbo,security,shortNames=pa
diff --git a/api/security/v1alpha3/peer_authentication.proto
b/api/security/v1alpha3/peer_authentication.proto
index adf33baa..fc99d3f4 100644
--- a/api/security/v1alpha3/peer_authentication.proto
+++ b/api/security/v1alpha3/peer_authentication.proto
@@ -33,7 +33,7 @@ option go_package = "/api/security/v1alpha3";
// +cue-gen:PeerAuthentication:versions:v1alpha3
// +cue-gen:PeerAuthentication:storageVersion
// +cue-gen:PeerAuthentication:annotations:helm.sh/resource-policy=keep
-//
+cue-gen:PeerAuthentication:labels:app=dubbo-planet,chart=dubbo,dubbo=security,heritage=Tiller,release=dubbo
+//
+cue-gen:PeerAuthentication:labels:app=dubbo,chart=dubbo,dubbo=security,heritage=Tiller,release=dubbo
// +cue-gen:PeerAuthentication:subresource:status
// +cue-gen:PeerAuthentication:scope:Namespaced
// +cue-gen:PeerAuthentication:resource:categories=dubbo,security,shortNames=pa
diff --git a/client-go/pkg/apis/networking/v1alpha3/types.gen.go
b/client-go/pkg/apis/networking/v1alpha3/types.gen.go
index 6eeaad5c..173f57cb 100644
--- a/client-go/pkg/apis/networking/v1alpha3/types.gen.go
+++ b/client-go/pkg/apis/networking/v1alpha3/types.gen.go
@@ -34,7 +34,7 @@ import (
// +cue-gen:DestinationRule:groupName:networking.dubbo.apache.org
// +cue-gen:DestinationRule:versions:v1alpha3
// +cue-gen:DestinationRule:annotations:helm.sh/resource-policy=keep
-//
+cue-gen:DestinationRule:labels:app=dubbo-planet,chart=dubbo,heritage=Tiller,release=dubbo
+//
+cue-gen:DestinationRule:labels:app=dubbo,chart=dubbo,heritage=Tiller,release=dubbo
// +cue-gen:DestinationRule:subresource:status
// +cue-gen:DestinationRule:scope:Namespaced
// +cue-gen:DestinationRule:resource:categories=dubbo,networking,shortNames=dr
@@ -86,7 +86,7 @@ type DestinationRuleList struct {
// +cue-gen:VirtualService:groupName:networking.dubbo.apache.org
// +cue-gen:VirtualService:versions:v1alpha3
// +cue-gen:VirtualService:annotations:helm.sh/resource-policy=keep
-//
+cue-gen:VirtualService:labels:app=dubbo-planet,chart=dubbo,heritage=Tiller,release=dubbo
+//
+cue-gen:VirtualService:labels:app=dubbo,chart=dubbo,heritage=Tiller,release=dubbo
// +cue-gen:VirtualService:subresource:status
// +cue-gen:VirtualService:scope:Namespaced
// +cue-gen:VirtualService:resource:categories=dubbo,networking,shortNames=vs
diff --git a/client-go/pkg/apis/security/v1alpha3/types.gen.go
b/client-go/pkg/apis/security/v1alpha3/types.gen.go
index 9a51eaa3..a188d876 100644
--- a/client-go/pkg/apis/security/v1alpha3/types.gen.go
+++ b/client-go/pkg/apis/security/v1alpha3/types.gen.go
@@ -32,7 +32,7 @@ import (
// +cue-gen:PeerAuthentication:versions:v1alpha3
// +cue-gen:PeerAuthentication:storageVersion
// +cue-gen:PeerAuthentication:annotations:helm.sh/resource-policy=keep
-//
+cue-gen:PeerAuthentication:labels:app=dubbo-planet,chart=dubbo,dubbo=security,heritage=Tiller,release=dubbo
+//
+cue-gen:PeerAuthentication:labels:app=dubbo,chart=dubbo,dubbo=security,heritage=Tiller,release=dubbo
// +cue-gen:PeerAuthentication:subresource:status
// +cue-gen:PeerAuthentication:scope:Namespaced
// +cue-gen:PeerAuthentication:resource:categories=dubbo,security,shortNames=pa
diff --git a/dubbod/discovery/cmd/dubbo-agent/app/cmd.go
b/dubbod/discovery/cmd/dubbo-agent/app/cmd.go
index 62cce8b0..61c328dd 100644
--- a/dubbod/discovery/cmd/dubbo-agent/app/cmd.go
+++ b/dubbod/discovery/cmd/dubbo-agent/app/cmd.go
@@ -46,9 +46,9 @@ var (
func NewRootCommand(sds dubboagent.SDSServiceFactory) *cobra.Command {
rootCmd := &cobra.Command{
- Use: "planet-agent",
- Short: "Dubbo Planet agent.",
- Long: "Dubbo Planet agent bootstraps via gRPC xDS.",
+ Use: "dubbo-agent",
+ Short: "Dubbo agent.",
+ Long: "Dubbo agent bootstraps via gRPC xDS.",
SilenceUsage: true,
FParseErrWhitelist: cobra.FParseErrWhitelist{
UnknownFlags: true,
diff --git a/dubbod/discovery/cmd/dubbo-agent/config/config.go
b/dubbod/discovery/cmd/dubbo-agent/config/config.go
index e1807587..2c38adda 100644
--- a/dubbod/discovery/cmd/dubbo-agent/config/config.go
+++ b/dubbod/discovery/cmd/dubbo-agent/config/config.go
@@ -18,7 +18,7 @@ package config
import "strings"
-func GetPlanetSan(discoveryAddress string) string {
+func GetDubboSan(discoveryAddress string) string {
discHost := strings.Split(discoveryAddress, ":")[0]
// For local debugging - the discoveryAddress is set to localhost, but
the cert issued for normal PA.
if discHost == "localhost" {
diff --git a/dubbod/discovery/cmd/dubbo-agent/options/agent_proxy.go
b/dubbod/discovery/cmd/dubbo-agent/options/agent_proxy.go
index 5b6025f5..28c99e37 100644
--- a/dubbod/discovery/cmd/dubbo-agent/options/agent_proxy.go
+++ b/dubbod/discovery/cmd/dubbo-agent/options/agent_proxy.go
@@ -16,11 +16,11 @@
package options
-import planetagent "github.com/apache/dubbo-kubernetes/pkg/dubboagent"
+import "github.com/apache/dubbo-kubernetes/pkg/dubboagent"
// ProxyArgs provides all of the configuration parameters for the Saku proxy.
type ProxyArgs struct {
- planetagent.Proxy
+ dubboagent.Proxy
Concurrency int
StsPort int
diff --git a/dubbod/discovery/cmd/dubbo-agent/options/security.go
b/dubbod/discovery/cmd/dubbo-agent/options/security.go
index e275c38b..514b7b02 100644
--- a/dubbod/discovery/cmd/dubbo-agent/options/security.go
+++ b/dubbod/discovery/cmd/dubbo-agent/options/security.go
@@ -39,7 +39,7 @@ func NewSecurityOptions(proxyConfig
*serviceRouteIndex.ProxyConfig, stsPort int,
o := &security.Options{
CAEndpoint: caEndpointEnv,
CAProviderName: caProviderEnv,
- PlanetCertProvider: features.PlanetCertProvider,
+ DubboCertProvider: features.DubboCertProvider,
OutputKeyCertToDir: outputKeyCertToDir,
ProvCert: provCert,
ClusterID: clusterIDVar.Get(),
diff --git a/dubbod/discovery/cmd/dubbo-discover/app/cmd.go
b/dubbod/discovery/cmd/dubbo-discover/app/cmd.go
index 51f7e16b..c882f9b1 100644
--- a/dubbod/discovery/cmd/dubbo-discover/app/cmd.go
+++ b/dubbod/discovery/cmd/dubbo-discover/app/cmd.go
@@ -89,7 +89,7 @@ func newDiscoveryCommand() *cobra.Command {
}
func addFlags(c *cobra.Command) {
- serverArgs = bootstrap.NewPlanetArgs(func(p *bootstrap.DubboArgs) {
+ serverArgs = bootstrap.NewDubboArgs(func(p *bootstrap.DubboArgs) {
p.CtrlZOptions = ctrlz.DefaultOptions()
p.InjectionOptions = bootstrap.InjectionOptions{
InjectionDirectory: "./var/lib/dubbo/inject",
diff --git a/dubbod/discovery/docker/dockerfile.planet
b/dubbod/discovery/docker/dockerfile.planet
index fe9e7904..de35f0f8 100644
--- a/dubbod/discovery/docker/dockerfile.planet
+++ b/dubbod/discovery/docker/dockerfile.planet
@@ -14,6 +14,6 @@
# limitations under the License.
FROM gcr.io/distroless/static:debug
-COPY bin/planet-discovery /usr/local/bin/planet-discovery
+COPY bin/dubbo-discovery /usr/local/bin/dubbo-discovery
USER 9999:9999
-ENTRYPOINT ["/usr/local/bin/planet-discovery"]
+ENTRYPOINT ["/usr/local/bin/dubbo-discovery"]
diff --git a/dubbod/discovery/docker/dockerfile.proxyadapter
b/dubbod/discovery/docker/dockerfile.proxyadapter
index d89f531a..5cde2f66 100644
--- a/dubbod/discovery/docker/dockerfile.proxyadapter
+++ b/dubbod/discovery/docker/dockerfile.proxyadapter
@@ -14,7 +14,7 @@
# limitations under the License.
FROM gcr.io/distroless/static:debug
-COPY bin/planet-agent /usr/local/bin/planet-agent
+COPY bin/dubbo-agent /usr/local/bin/dubbo-agent
COPY bin/pixiugateway /usr/local/bin/pixiugateway
USER 9999:9999
-ENTRYPOINT ["/usr/local/bin/planet-agent"]
+ENTRYPOINT ["/usr/local/bin/dubbo-agent"]
diff --git a/dubbod/discovery/pkg/bootstrap/cert_controller.go
b/dubbod/discovery/pkg/bootstrap/cert_controller.go
index 402e811f..efa2946b 100644
--- a/dubbod/discovery/pkg/bootstrap/cert_controller.go
+++ b/dubbod/discovery/pkg/bootstrap/cert_controller.go
@@ -102,9 +102,9 @@ func (s *Server) RotateDNSCertForK8sCA(stop <-chan
struct{}, defaultCACertPath s
func (s *Server) initDNSCertsK8SRA() error {
var certChain, keyPEM, caBundle []byte
var err error
- planetCertProviderName := features.PlanetCertProvider
+ dubboCertProviderName := features.DubboCertProvider
- signerName := strings.TrimPrefix(planetCertProviderName,
constants.CertProviderKubernetesSignerPrefix)
+ signerName := strings.TrimPrefix(dubboCertProviderName,
constants.CertProviderKubernetesSignerPrefix)
log.Infof("Generating K8S-signed cert for %v using signer %v",
s.dnsNames, signerName)
certChain, keyPEM, _, err = chiron.GenKeyCertK8sCA(s.kubeClient.Kube(),
strings.Join(s.dnsNames, ","), "", signerName, true,
SelfSignedCACertTTL.Get())
diff --git a/dubbod/discovery/pkg/bootstrap/config_controller.go
b/dubbod/discovery/pkg/bootstrap/config_controller.go
index 56a67c01..a268b69f 100644
--- a/dubbod/discovery/pkg/bootstrap/config_controller.go
+++ b/dubbod/discovery/pkg/bootstrap/config_controller.go
@@ -57,9 +57,9 @@ func (s *Server) makeKubeConfigController(args *DubboArgs)
*crdclient.Client {
KrtDebugger: args.KrtDebugger,
}
- schemas := collections.Planet
+ schemas := collections.Dubbo
if features.EnableGatewayAPI {
- schemas = collections.PlanetGatewayAPI()
+ schemas = collections.DubboGatewayAPI()
}
return crdclient.NewForSchemas(s.kubeClient, opts, schemas)
}
@@ -162,7 +162,7 @@ func (s *Server) initConfigSources(args *DubboArgs) (err
error) {
configController, err := file.NewController(
srcAddress.Path,
args.RegistryOptions.KubeOptions.DomainSuffix,
- collections.Planet,
+ collections.Dubbo,
args.RegistryOptions.KubeOptions,
)
if err != nil {
@@ -190,7 +190,7 @@ func (s *Server) initConfigSources(args *DubboArgs) (err
error) {
if err != nil {
return fmt.Errorf("failed to dial XDS %s %v",
configSource.Address, err)
}
- store := memory.Make(collections.Planet)
+ store := memory.Make(collections.Dubbo)
configController := memory.NewController(store)
configController.RegisterHasSyncedHandler(xdsClient.HasSynced)
xdsClient.Store = configController
@@ -233,7 +233,7 @@ func (s *Server) initConfigController(args *DubboArgs)
error {
configController, err := file.NewController(
args.RegistryOptions.FileDir,
args.RegistryOptions.KubeOptions.DomainSuffix,
- collections.Planet,
+ collections.Dubbo,
args.RegistryOptions.KubeOptions,
)
if err != nil {
diff --git a/dubbod/discovery/pkg/bootstrap/options.go
b/dubbod/discovery/pkg/bootstrap/options.go
index 590a4f01..9a724db8 100644
--- a/dubbod/discovery/pkg/bootstrap/options.go
+++ b/dubbod/discovery/pkg/bootstrap/options.go
@@ -73,7 +73,7 @@ type TLSOptions struct {
CipherSuits []uint16 // This is the parsed cipher suites
}
-func NewPlanetArgs(initFuncs ...func(*DubboArgs)) *DubboArgs {
+func NewDubboArgs(initFuncs ...func(*DubboArgs)) *DubboArgs {
p := &DubboArgs{}
// Apply Default Values.
diff --git a/dubbod/discovery/pkg/bootstrap/server.go
b/dubbod/discovery/pkg/bootstrap/server.go
index 9fdf3cad..04c8b636 100644
--- a/dubbod/discovery/pkg/bootstrap/server.go
+++ b/dubbod/discovery/pkg/bootstrap/server.go
@@ -472,10 +472,10 @@ func (s *Server) initRegistryEventHandlers() {
// Build ConfigKey for the changed config
// Find the schema to get the kind.Kind
- // First try Planet schemas, then try PlanetGatewayAPI schemas
- schema, found :=
collections.Planet.FindByGroupVersionKind(cfg.GroupVersionKind)
+ // First try Dubbo schemas, then try DubboGatewayAPI schemas
+ schema, found :=
collections.Dubbo.FindByGroupVersionKind(cfg.GroupVersionKind)
if !found && features.EnableGatewayAPI {
- schema, found =
collections.PlanetGatewayAPI().FindByGroupVersionKind(cfg.GroupVersionKind)
+ schema, found =
collections.DubboGatewayAPI().FindByGroupVersionKind(cfg.GroupVersionKind)
}
if !found {
log.Warnf("configHandler: schema not found for %v,
skipping", cfg.GroupVersionKind)
@@ -530,9 +530,9 @@ func (s *Server) initRegistryEventHandlers() {
Full: needsFullPush, // Full push for
DestinationRule/VirtualService to reload PushContext
})
}
- schemas := collections.Planet.All()
+ schemas := collections.Dubbo.All()
if features.EnableGatewayAPI {
- schemas = collections.PlanetGatewayAPI().All()
+ schemas = collections.DubboGatewayAPI().All()
}
log.Debugf("initRegistryEventHandlers: found %d schemas to register",
len(schemas))
registeredCount := 0
@@ -718,8 +718,8 @@ func (s *Server) createPeerCertVerifier(tlsOptions
TLSOptions, trustDomain strin
}
} else {
if s.RA != nil {
- if strings.HasPrefix(features.PlanetCertProvider,
constants.CertProviderKubernetesSignerPrefix) {
- signerName :=
strings.TrimPrefix(features.PlanetCertProvider,
constants.CertProviderKubernetesSignerPrefix)
+ if strings.HasPrefix(features.DubboCertProvider,
constants.CertProviderKubernetesSignerPrefix) {
+ signerName :=
strings.TrimPrefix(features.DubboCertProvider,
constants.CertProviderKubernetesSignerPrefix)
caBundle, _ :=
s.RA.GetRootCertFromMeshGlobalConfig(signerName)
rootCertBytes = append(rootCertBytes,
caBundle...)
} else {
@@ -821,7 +821,7 @@ func (s *Server) initSDSServer() {
}
if !features.EnableXDSIdentityCheck {
// Make sure we have security
- log.Warnf("skipping Kubernetes credential reader;
PLANET_ENABLE_XDS_IDENTITY_CHECK must be set to true for this feature.")
+ log.Warnf("skipping Kubernetes credential reader;
DUBBO_ENABLE_XDS_IDENTITY_CHECK must be set to true for this feature.")
} else {
// TODO ConfigUpdated Multicluster get secret and configmap
}
@@ -829,7 +829,7 @@ func (s *Server) initSDSServer() {
// isK8SSigning returns whether K8S (as a RA) is used to sign certs instead of
private keys known by Dubbod
func (s *Server) isK8SSigning() bool {
- return s.RA != nil && strings.HasPrefix(features.PlanetCertProvider,
constants.CertProviderKubernetesSignerPrefix)
+ return s.RA != nil && strings.HasPrefix(features.DubboCertProvider,
constants.CertProviderKubernetesSignerPrefix)
}
func (s *Server) cachesSynced() bool {
@@ -941,17 +941,17 @@ func (s *Server) initDubbodCerts(args *DubboArgs, host
string) error {
log.Errorf("error initializing certificate watches:
%v", err)
return nil
}
- } else if features.EnableCAServer && features.PlanetCertProvider ==
constants.CertProviderDubbod {
+ } else if features.EnableCAServer && features.DubboCertProvider ==
constants.CertProviderDubbod {
log.Infof("initializing Dubbod DNS certificates host: %s,
custom host: %s", host, features.DubbodServiceCustomHost)
err = s.initDNSCertsDubbod()
- } else if features.PlanetCertProvider ==
constants.CertProviderKubernetes {
- log.Warnf("PLANET_CERT_PROVIDER=kubernetes is no longer
supported by upstream K8S")
- } else if strings.HasPrefix(features.PlanetCertProvider,
constants.CertProviderKubernetesSignerPrefix) {
- log.Infof("initializing Dubbod DNS certificates using K8S RA:%s
host: %s, custom host: %s", features.PlanetCertProvider,
+ } else if features.DubboCertProvider ==
constants.CertProviderKubernetes {
+ log.Warnf("DUBBO_CERT_PROVIDER=kubernetes is no longer
supported by upstream K8S")
+ } else if strings.HasPrefix(features.DubboCertProvider,
constants.CertProviderKubernetesSignerPrefix) {
+ log.Infof("initializing Dubbod DNS certificates using K8S RA:%s
host: %s, custom host: %s", features.DubboCertProvider,
host, features.DubbodServiceCustomHost)
err = s.initDNSCertsK8SRA()
} else {
- log.Warnf("PLANET_CERT_PROVIDER=%s is not implemented",
features.PlanetCertProvider)
+ log.Warnf("DUBBO_CERT_PROVIDER=%s is not implemented",
features.DubboCertProvider)
}
if err == nil {
@@ -982,7 +982,7 @@ func (s *Server) shouldStartNsController() bool {
}
// For no CA we don't distribute it either, as there is no cert
- if features.PlanetCertProvider == constants.CertProviderNone {
+ if features.DubboCertProvider == constants.CertProviderNone {
return false
}
@@ -1018,17 +1018,17 @@ func hasCustomTLSCerts(tlsOptions TLSOptions) (ok bool,
tlsCertPath, tlsKeyPath,
return true, tlsOptions.CertFile, tlsOptions.KeyFile,
tlsOptions.CaCertFile
}
- if ok = checkPathsExist(constants.DefaultPlanetTLSCert,
constants.DefaultPlanetTLSKey, constants.DefaultPlanetTLSCaCert); ok {
- tlsCertPath = constants.DefaultPlanetTLSCert
- tlsKeyPath = constants.DefaultPlanetTLSKey
- caCertPath = constants.DefaultPlanetTLSCaCert
+ if ok = checkPathsExist(constants.DefaultDubboTLSCert,
constants.DefaultDubboTLSKey, constants.DefaultDubboTLSCaCert); ok {
+ tlsCertPath = constants.DefaultDubboTLSCert
+ tlsKeyPath = constants.DefaultDubboTLSKey
+ caCertPath = constants.DefaultDubboTLSCaCert
return
}
- if ok = checkPathsExist(constants.DefaultPlanetTLSCert,
constants.DefaultPlanetTLSKey, constants.DefaultPlanetTLSCaCertAlternatePath);
ok {
- tlsCertPath = constants.DefaultPlanetTLSCert
- tlsKeyPath = constants.DefaultPlanetTLSKey
- caCertPath = constants.DefaultPlanetTLSCaCertAlternatePath
+ if ok = checkPathsExist(constants.DefaultDubboTLSCert,
constants.DefaultDubboTLSKey, constants.DefaultDubboTLSCaCertAlternatePath); ok
{
+ tlsCertPath = constants.DefaultDubboTLSCert
+ tlsKeyPath = constants.DefaultDubboTLSKey
+ caCertPath = constants.DefaultDubboTLSCaCertAlternatePath
return
}
diff --git a/dubbod/discovery/pkg/bootstrap/validation.go
b/dubbod/discovery/pkg/bootstrap/validation.go
index e73f3481..f2ff4edc 100644
--- a/dubbod/discovery/pkg/bootstrap/validation.go
+++ b/dubbod/discovery/pkg/bootstrap/validation.go
@@ -30,7 +30,7 @@ func (s *Server) initConfigValidation(args *DubboArgs) error {
}
log.Info("initializing config validator")
params := server.Options{
- Schemas: collections.Planet,
+ Schemas: collections.Dubbo,
DomainSuffix: args.RegistryOptions.KubeOptions.DomainSuffix,
Mux: s.httpsMux,
}
diff --git a/dubbod/discovery/pkg/config/kube/crd/conversion.go
b/dubbod/discovery/pkg/config/kube/crd/conversion.go
index a3bd790c..6a18bb4f 100644
--- a/dubbod/discovery/pkg/config/kube/crd/conversion.go
+++ b/dubbod/discovery/pkg/config/kube/crd/conversion.go
@@ -56,7 +56,7 @@ func parseInputsImpl(inputs string, withValidate bool)
([]config.Config, []Dubbo
}
// gvk := obj.GroupVersionKind()
- // s, exists :=
collections.PlanetGatewayAPI().FindByGroupVersionAliasesKind(resource.FromKubernetesGVK(&gvk))
+ // s, exists :=
collections.DubboGatewayAPI().FindByGroupVersionAliasesKind(resource.FromKubernetesGVK(&gvk))
// if !exists {
// log.Debugf("unrecognized type %v", obj.Kind)
// others = append(others, obj)
diff --git a/dubbod/discovery/pkg/config/kube/crdclient/client.go
b/dubbod/discovery/pkg/config/kube/crdclient/client.go
index c691e8c1..89cb135e 100644
--- a/dubbod/discovery/pkg/config/kube/crdclient/client.go
+++ b/dubbod/discovery/pkg/config/kube/crdclient/client.go
@@ -88,7 +88,7 @@ func NewForSchemas(client kube.Client, opts Option, schemas
collection.Schemas)
client: client,
filtersByGVK: opts.FiltersByGVK,
stop: stop,
- logger: log.RegisterScope("crdclient", "Planet
Kubernetes CRD controller"),
+ logger: log.RegisterScope("crdclient", "Dubbo
Kubernetes CRD controller"),
}
kopts := krt.NewOptionsBuilder(stop, "crdclient", opts.KrtDebugger)
@@ -108,11 +108,11 @@ func (cl *Client) Run(stop <-chan struct{}) {
}
t0 := time.Now()
- cl.logger.Infof("Starting Planet Kubernetes CRD controller")
+ cl.logger.Infof("Starting Dubbo Kubernetes CRD controller")
if !kube.WaitForCacheSync("crdclient", stop, cl.informerSynced) {
- cl.logger.Infof("Failed to sync Planet Kubernetes CRD
controller cache")
+ cl.logger.Infof("Failed to sync Dubbo Kubernetes CRD controller
cache")
} else {
- cl.logger.Infof("Planet Kubernetes CRD controller synced in
%v", time.Since(t0))
+ cl.logger.Infof("Dubbo Kubernetes CRD controller synced in %v",
time.Since(t0))
}
<-stop
close(cl.stop)
diff --git a/dubbod/discovery/pkg/config/kube/crdclient/types.go
b/dubbod/discovery/pkg/config/kube/crdclient/types.go
index 1b9e2ce4..5e8167a4 100644
--- a/dubbod/discovery/pkg/config/kube/crdclient/types.go
+++ b/dubbod/discovery/pkg/config/kube/crdclient/types.go
@@ -349,7 +349,7 @@ func patch(c kube.Client, orig config.Config, origMeta
metav1.ObjectMeta, mod co
Group: "networking.dubbo.apache.org",
Version: "v1alpha3",
Resource: "destinationrules",
- }).Namespace(orig.Namespace).Patch(context.TODO(), orig.Name,
typ, patchBytes, metav1.PatchOptions{FieldManager: "planet-discovery"})
+ }).Namespace(orig.Namespace).Patch(context.TODO(), orig.Name,
typ, patchBytes, metav1.PatchOptions{FieldManager: "dubbo-discovery"})
case gvk.PeerAuthentication:
origSpec :=
orig.Spec.(*orgapachedubboapisecurityv1alpha3.PeerAuthentication)
modSpec :=
mod.Spec.(*orgapachedubboapisecurityv1alpha3.PeerAuthentication)
@@ -371,7 +371,7 @@ func patch(c kube.Client, orig config.Config, origMeta
metav1.ObjectMeta, mod co
Group: "security.dubbo.apache.org",
Version: "v1alpha3",
Resource: "peerauthentications",
- }).Namespace(orig.Namespace).Patch(context.TODO(), orig.Name,
typ, patchBytes, metav1.PatchOptions{FieldManager: "planet-discovery"})
+ }).Namespace(orig.Namespace).Patch(context.TODO(), orig.Name,
typ, patchBytes, metav1.PatchOptions{FieldManager: "dubbo-discovery"})
case gvk.VirtualService:
// VirtualService uses networking.dubbo.apache.org API group,
use Dynamic client
origSpec :=
orig.Spec.(*orgapachedubboapinetworkingv1alpha3.VirtualService)
@@ -394,7 +394,7 @@ func patch(c kube.Client, orig config.Config, origMeta
metav1.ObjectMeta, mod co
Group: "networking.dubbo.apache.org",
Version: "v1alpha3",
Resource: "virtualservices",
- }).Namespace(orig.Namespace).Patch(context.TODO(), orig.Name,
typ, patchBytes, metav1.PatchOptions{FieldManager: "planet-discovery"})
+ }).Namespace(orig.Namespace).Patch(context.TODO(), orig.Name,
typ, patchBytes, metav1.PatchOptions{FieldManager: "dubbo-discovery"})
case gvk.GatewayClass:
oldRes := &sigsk8siogatewayapiapisv1.GatewayClass{
ObjectMeta: origMeta,
@@ -424,7 +424,7 @@ func patch(c kube.Client, orig config.Config, origMeta
metav1.ObjectMeta, mod co
return nil, err
}
return c.GatewayAPI().GatewayV1().Gateways(orig.Namespace).
- Patch(context.TODO(), orig.Name, typ, patchBytes,
metav1.PatchOptions{FieldManager: "planet-discovery"})
+ Patch(context.TODO(), orig.Name, typ, patchBytes,
metav1.PatchOptions{FieldManager: "dubbo-discovery"})
case gvk.HTTPRoute:
oldRes := &sigsk8siogatewayapiapisv1.HTTPRoute{
ObjectMeta: origMeta,
diff --git a/dubbod/discovery/pkg/config/kube/file/controller.go
b/dubbod/discovery/pkg/config/kube/file/controller.go
index c1bf5928..43ef5ded 100644
--- a/dubbod/discovery/pkg/config/kube/file/controller.go
+++ b/dubbod/discovery/pkg/config/kube/file/controller.go
@@ -66,7 +66,7 @@ func NewController(fileDir string, domainSuffix string,
schemas collection.Schem
data := make(map[config.GroupVersionKind]kindStore)
for _, s := range schemas.All() {
gvk := s.GroupVersionKind()
- if _, ok := collections.Planet.FindByGroupVersionKind(gvk); ok {
+ if _, ok := collections.Dubbo.FindByGroupVersionKind(gvk); ok {
collection := krt.NewCollection(mainCollection,
func(ctx krt.HandlerContext, c ConfigKind) *config.Config {
if c.GroupVersionKind == gvk {
return c.Config
diff --git a/dubbod/discovery/pkg/features/experimental.go
b/dubbod/discovery/pkg/features/experimental.go
index 699de332..3ffe8aef 100644
--- a/dubbod/discovery/pkg/features/experimental.go
+++ b/dubbod/discovery/pkg/features/experimental.go
@@ -19,7 +19,7 @@ package features
import "github.com/apache/dubbo-kubernetes/pkg/env"
var (
- CACertConfigMapName = env.Register("PLANET_CA_CERT_CONFIGMAP",
"dubbo-ca-root-cert",
+ CACertConfigMapName = env.Register("DUBBO_CA_CERT_CONFIGMAP",
"dubbo-ca-root-cert",
"The name of the ConfigMap that stores the Root CA Certificate
that is used by dubbod").Get()
EnableLeaderElection = env.Register("ENABLE_LEADER_ELECTION", true,
"If enabled (default), starts a leader election client and
gains leadership before executing controllers. "+
@@ -27,13 +27,13 @@ var (
EnableEnhancedDestinationRuleMerge =
env.Register("ENABLE_ENHANCED_DESTINATIONRULE_MERGE", true,
"If enabled, Dubbo merge destinationrules considering their
exportTo fields,"+
" they will be kept as independent rules if the
exportTos are not equal.").Get()
- EnableGatewayAPI = env.Register("PLANET_ENABLE_GATEWAY_API", true,
+ EnableGatewayAPI = env.Register("DUBBO_ENABLE_GATEWAY_API", true,
"If this is set to true, support for Kubernetes gateway-api
(github.com/kubernetes-sigs/gateway-api) will "+
" be enabled. In addition to this being enabled, the
gateway-api CRDs need to be installed.").Get()
- EnableGatewayAPIStatus =
env.Register("PLANET_ENABLE_GATEWAY_API_STATUS", true,
+ EnableGatewayAPIStatus =
env.Register("DUBBO_ENABLE_GATEWAY_API_STATUS", true,
"If this is set to true, gateway-api resources will have status
written to them").Get()
- EnableGatewayAPIGatewayClassController =
env.Register("PLANET_ENABLE_GATEWAY_API_GATEWAYCLASS_CONTROLLER", true,
+ EnableGatewayAPIGatewayClassController =
env.Register("DUBBO_ENABLE_GATEWAY_API_GATEWAYCLASS_CONTROLLER", true,
"If this is set to true, dubbod will create and manage its
default GatewayClasses").Get()
- EnableGatewayAPIDeploymentController =
env.Register("PLANET_ENABLE_GATEWAY_API_DEPLOYMENT_CONTROLLER", true,
+ EnableGatewayAPIDeploymentController =
env.Register("DUBBO_ENABLE_GATEWAY_API_DEPLOYMENT_CONTROLLER", true,
"If this is set to true, gateway-api resources will
automatically provision in cluster deployment, services, etc").Get()
)
diff --git a/dubbod/discovery/pkg/features/planet.go
b/dubbod/discovery/pkg/features/planet.go
index f3178e17..7f055dc2 100644
--- a/dubbod/discovery/pkg/features/planet.go
+++ b/dubbod/discovery/pkg/features/planet.go
@@ -40,13 +40,13 @@ var (
"If this is set to false, will not create CA server in
dubbod.").Get()
// EnableCACRL ToDo (nilekh): remove this feature flag once it's stable
EnableCACRL = env.Register(
- "PLANET_ENABLE_CA_CRL",
+ "DUBBO_ENABLE_CA_CRL",
true, // Default value (true = feature enabled by default)
"If set to false, Dubbo will not watch for the ca-crl.pem file
in the /etc/cacerts directory "+
"and will not distribute CRL data to namespaces for
proxies to consume.",
).Get()
- PlanetCertProvider = env.Register("PLANET_CERT_PROVIDER",
constants.CertProviderDubbod,
- "The provider of Planet DNS certificate. K8S RA will be used
for k8s.io/NAME. 'dubbod' value will sign"+
+ DubboCertProvider = env.Register("DUBBO_CERT_PROVIDER",
constants.CertProviderDubbod,
+ "The provider of Dubbo DNS certificate. K8S RA will be used for
k8s.io/NAME. 'dubbod' value will sign"+
" using Dubbo build in CA. Other values will not not
generate TLS certs, but still "+
" distribute ./etc/certs/root-cert.pem. Only used if
custom certificates are not mounted.").Get()
DubbodServiceCustomHost = env.Register("DUBBOD_CUSTOM_HOST", "",
@@ -56,10 +56,10 @@ var (
"Name of the mutatingwebhookconfiguration to patch, if dubboctl
is not used.").Get()
ResolveHostnameGateways = env.Register("RESOLVE_HOSTNAME_GATEWAYS",
true,
"If true, hostnames in the LoadBalancer addresses of a Service
will be resolved at the control plane for use in cross-network gateways.").Get()
- ManagedGatewayController =
env.Register("PLANET_GATEWAY_API_CONTROLLER_NAME",
"dubbo.apache.org/gateway-controller",
+ ManagedGatewayController =
env.Register("DUBBO_GATEWAY_API_CONTROLLER_NAME",
"dubbo.apache.org/gateway-controller",
"Gateway API controller name. dubbod will only reconcile
Gateway API resources referencing a GatewayClass with this controller
name").Get()
- GatewayAPIDefaultGatewayClass =
env.Register("PLANET_GATEWAY_API_DEFAULT_GATEWAYCLASS_NAME", "dubbo",
+ GatewayAPIDefaultGatewayClass =
env.Register("DUBBO_GATEWAY_API_DEFAULT_GATEWAYCLASS_NAME", "dubbo",
"Name of the default GatewayClass").Get()
- StatusMaxWorkers = env.Register("PLANET_STATUS_MAX_WORKERS", 100, "The
maximum number of workers"+
+ StatusMaxWorkers = env.Register("DUBBO_STATUS_MAX_WORKERS", 100, "The
maximum number of workers"+
" for status update").Get()
)
diff --git a/dubbod/discovery/pkg/features/security.go
b/dubbod/discovery/pkg/features/security.go
index 9bb11907..5087460c 100644
--- a/dubbod/discovery/pkg/features/security.go
+++ b/dubbod/discovery/pkg/features/security.go
@@ -24,8 +24,8 @@ var (
"If enabled, dubbod will use a secret named cacerts to store
its self-signed dubbo-"+
"generated root certificate.").Get()
EnableXDSIdentityCheck = env.Register(
- "PLANET_ENABLE_XDS_IDENTITY_CHECK",
+ "DUBBO_ENABLE_XDS_IDENTITY_CHECK",
true,
- "If enabled, planet will authorize XDS clients, to ensure they
are acting only as namespaces they have permissions for.",
+ "If enabled, dubbo will authorize XDS clients, to ensure they
are acting only as namespaces they have permissions for.",
).Get()
)
diff --git a/dubbod/discovery/pkg/features/tuning.go
b/dubbod/discovery/pkg/features/tuning.go
index c4d90238..8acf1fdb 100644
--- a/dubbod/discovery/pkg/features/tuning.go
+++ b/dubbod/discovery/pkg/features/tuning.go
@@ -29,7 +29,7 @@ var (
"Sets the maximum number of concurrent grpc streams.",
).Get()
- // MaxRecvMsgSize The max receive buffer size of gRPC received channel
of Planet in bytes.
+ // MaxRecvMsgSize The max receive buffer size of gRPC received channel
of Dubbo in bytes.
MaxRecvMsgSize = env.Register(
"DUBBO_GPRC_MAXRECVMSGSIZE",
4*1024*1024,
@@ -38,7 +38,7 @@ var (
RequestLimit = func() float64 {
v := env.Register(
- "PLANET_MAX_REQUESTS_PER_SECOND",
+ "DUBBO_MAX_REQUESTS_PER_SECOND",
0.0,
"Limits the number of incoming XDS requests per second.
On larger machines this can be increased to handle more proxies concurrently. "+
"If set to 0 or unset, the max will be
automatically determined based on the machine size",
@@ -56,30 +56,30 @@ var (
}()
DebounceAfter = env.Register(
- "PLANET_DEBOUNCE_AFTER",
+ "DUBBO_DEBOUNCE_AFTER",
100*time.Millisecond,
"The delay added to config/registry events for debouncing. This
will delay the push by "+
"at least this interval. If no change is detected
within this period, the push will happen, "+
- " otherwise we'll keep delaying until things settle, up
to a max of PLANET_DEBOUNCE_MAX.",
+ " otherwise we'll keep delaying until things settle, up
to a max of DUBBO_DEBOUNCE_MAX.",
).Get()
DebounceMax = env.Register(
- "PLANET_DEBOUNCE_MAX",
+ "DUBBO_DEBOUNCE_MAX",
10*time.Second,
"The maximum amount of time to wait for events while
debouncing. If events keep showing up with no breaks "+
"for this time, we'll trigger a push.",
).Get()
EnableEDSDebounce = env.Register(
- "PLANET_ENABLE_EDS_DEBOUNCE",
+ "DUBBO_ENABLE_EDS_DEBOUNCE",
true,
- "If enabled, Planet will include EDS pushes in the push
debouncing, configured by PLANET_DEBOUNCE_AFTER and PLANET_DEBOUNCE_MAX."+
+ "If enabled, Dubbo will include EDS pushes in the push
debouncing, configured by DUBBO_DEBOUNCE_AFTER and DUBBO_DEBOUNCE_MAX."+
" EDS pushes may be delayed, but there will be fewer
pushes. By default this is enabled",
).Get()
PushThrottle = func() int {
v := env.Register(
- "PLANET_PUSH_THROTTLE",
+ "DUBBO_PUSH_THROTTLE",
0,
"Limits the number of concurrent pushes allowed. On
larger machines this can be increased for faster pushes. "+
"If set to 0 or unset, the max will be
automatically determined based on the machine size",
@@ -95,8 +95,8 @@ var (
// 32: 100
return min(15+5*procs, 100)
}()
- XDSCacheMaxSize = env.Register("PLANET_XDS_CACHE_SIZE", 60000,
+ XDSCacheMaxSize = env.Register("DUBBO_XDS_CACHE_SIZE", 60000,
"The maximum number of cache entries for the XDS cache.").Get()
- XDSCacheIndexClearInterval =
env.Register("PLANET_XDS_CACHE_INDEX_CLEAR_INTERVAL", 5*time.Second,
+ XDSCacheIndexClearInterval =
env.Register("DUBBO_XDS_CACHE_INDEX_CLEAR_INTERVAL", 5*time.Second,
"The interval for xds cache index clearing.").Get()
)
diff --git a/dubbod/discovery/pkg/features/xds.go
b/dubbod/discovery/pkg/features/xds.go
index 6af37991..24430050 100644
--- a/dubbod/discovery/pkg/features/xds.go
+++ b/dubbod/discovery/pkg/features/xds.go
@@ -19,12 +19,12 @@ package features
import "github.com/apache/dubbo-kubernetes/pkg/env"
var (
- EnableCDSCaching = env.Register("PLANET_ENABLE_CDS_CACHE", true,
- "If true, PLANET will cache CDS responses. Note: this depends
on PLANET_ENABLE_XDS_CACHE.").Get()
+ EnableCDSCaching = env.Register("DUBBO_ENABLE_CDS_CACHE", true,
+ "If true, DUBBO will cache CDS responses. Note: this depends on
DUBBO_ENABLE_XDS_CACHE.").Get()
- EnableRDSCaching = env.Register("PLANET_ENABLE_RDS_CACHE", true,
- "If true, PLANET will cache RDS responses. Note: this depends
on PLANET_ENABLE_XDS_CACHE.").Get()
+ EnableRDSCaching = env.Register("DUBBO_ENABLE_RDS_CACHE", true,
+ "If true, DUBBO will cache RDS responses. Note: this depends on
DUBBO_ENABLE_XDS_CACHE.").Get()
- EnableXDSCaching = env.Register("PLANET_ENABLE_XDS_CACHE", true,
- "If true, Planet will cache XDS responses.").Get()
+ EnableXDSCaching = env.Register("DUBBO_ENABLE_XDS_CACHE", true,
+ "If true, DUBBO will cache XDS responses.").Get()
)
diff --git
a/dubbod/discovery/pkg/serviceregistry/kube/controller/multicluster.go
b/dubbod/discovery/pkg/serviceregistry/kube/controller/multicluster.go
index ef558be1..0e1aba57 100644
--- a/dubbod/discovery/pkg/serviceregistry/kube/controller/multicluster.go
+++ b/dubbod/discovery/pkg/serviceregistry/kube/controller/multicluster.go
@@ -36,7 +36,7 @@ func (k *kubeController) Close() {
}
type Multicluster struct {
- // serverID of this planet instance used for leader election
+ // serverID of this dubbo instance used for leader election
serverID string
// options to use when creating kube controllers
@@ -124,7 +124,7 @@ func (m *Multicluster) initializeCluster(cluster
*multicluster.Cluster, kubeCont
nc := NewNamespaceController(client,
m.caBundleWatcher)
// Start informers again. This fixes
the case where informers for namespace do not start,
// as we create them only after
acquiring the leader lock
- // Note: stop here should be the
overall planet stop, NOT the leader election stop. We are
+ // Note: stop here should be the
overall dubbo stop, NOT the leader election stop. We are
// basically lazy loading the informer,
if we stop it when we lose the lock we will never
// recreate it again.
client.RunAndWait(clusterStopCh)
diff --git a/dubbod/discovery/pkg/xds/discovery.go
b/dubbod/discovery/pkg/xds/discovery.go
index cb826d37..1aadcf17 100644
--- a/dubbod/discovery/pkg/xds/discovery.go
+++ b/dubbod/discovery/pkg/xds/discovery.go
@@ -370,7 +370,6 @@ func (s *DiscoveryServer) ProxyUpdate(clusterID cluster.ID,
ip string) {
}
}
- // It is possible that the envoy has not connected to this planet,
maybe connected to another planet
if connection == nil {
return
}
diff --git a/go.sum b/go.sum
index f44e229c..46c095d4 100644
--- a/go.sum
+++ b/go.sum
@@ -402,6 +402,9 @@ github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.2
h1:sGm2vDRFUrQJO/Veii4h4z
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.2/go.mod
h1:wd1YpapPLivG6nQgbf7ZkG1hhSOXDhhn4MLTknx2aAc=
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho=
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod
h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
+github.com/grpc-ecosystem/grpc-gateway v1.16.0
h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3
h1:5ZPtiqj0JL5oKWmcsq4VMaAW5ukBEgSGXEN89zeH1Jo=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3/go.mod
h1:ndYquD05frm2vACXE1nsccT4oJzjhw2arTS2cpUD1PI=
github.com/hashicorp/errwrap v1.0.0/go.mod
h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
github.com/hashicorp/errwrap v1.1.0
h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
github.com/hashicorp/errwrap v1.1.0/go.mod
h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
@@ -524,8 +527,12 @@ github.com/munnerz/goautoneg
v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod
h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
github.com/nikolalohinski/gonja v1.5.3
h1:GsA+EEaZDZPGJ8JtpeGN78jidhOlxeJROpqMT9fTj9c=
github.com/nikolalohinski/gonja v1.5.3/go.mod
h1:RmjwxNiXAEqcq1HeK5SSMmqFJvKOfTfXhkJv6YBtPa4=
+github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
+github.com/nxadm/tail v1.4.8/go.mod
h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
github.com/onsi/ginkgo v1.6.0/go.mod
h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
github.com/onsi/ginkgo v1.8.0/go.mod
h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
+github.com/onsi/ginkgo v1.16.5/go.mod
h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
github.com/onsi/ginkgo/v2 v2.25.3
h1:Ty8+Yi/ayDAGtk4XxmmfUy4GabvM+MegeB4cDLRi6nw=
github.com/onsi/ginkgo/v2 v2.25.3/go.mod
h1:43uiyQC4Ed2tkOzLsEYm7hnrb7UJTWHYNsuy3bG/snE=
github.com/onsi/gomega v1.5.0/go.mod
h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
@@ -697,6 +704,10 @@
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 h1:F7Jx+6h
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0/go.mod
h1:UHB22Z8QsdRDrnAtX4PntOl36ajSxcdUMt1sF7Y6E7Q=
go.opentelemetry.io/otel v1.37.0
h1:9zhNfelUvx0KBfu/gb+ZgeAfAgtWrfHJZcAqFC228wQ=
go.opentelemetry.io/otel v1.37.0/go.mod
h1:ehE/umFRLnuLa/vSccNq9oS1ErUlkkK71gMcN34UG8I=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0
h1:OeNbIYk/2C15ckl7glBlOBp5+WlYsOElzTNmiPW/x60=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0/go.mod
h1:7Bept48yIeqxP2OZ9/AqIpYS94h2or0aB4FypJTc8ZM=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0
h1:tgJ0uaNS4c98WRNUEx5U3aDlrDOI5Rs+1Vifcw4DJ8U=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0/go.mod
h1:U7HYyW0zt/a9x5J1Kjs+r1f/d4ZHnYFclhYY2+YbeoE=
go.opentelemetry.io/otel/metric v1.37.0
h1:mvwbQS5m0tbmqML4NqK+e3aDiO02vsf/WgbsdpcPoZE=
go.opentelemetry.io/otel/metric v1.37.0/go.mod
h1:04wGrZurHYKOc+RKeye86GwKiTb9FKm1WHtO+4EVr2E=
go.opentelemetry.io/otel/sdk v1.37.0
h1:ItB0QUqnjesGRvNcmAcU0LyvkVyGJ2xftD29bWdDvKI=
@@ -705,6 +716,8 @@ go.opentelemetry.io/otel/sdk/metric v1.37.0
h1:90lI228XrB9jCMuSdA0673aubgRobVZFh
go.opentelemetry.io/otel/sdk/metric v1.37.0/go.mod
h1:cNen4ZWfiD37l5NhS+Keb5RXVWZWpRE+9WyVCpbo5ps=
go.opentelemetry.io/otel/trace v1.37.0
h1:HLdcFNbRQBE2imdSEgm/kwqmQj1Or1l/7bW6mxVK7z4=
go.opentelemetry.io/otel/trace v1.37.0/go.mod
h1:TlgrlQ+PtQO5XFerSPUYG0JSgGyryXewPGyayAWSBS0=
+go.opentelemetry.io/proto/otlp v1.7.0
h1:jX1VolD6nHuFzOYso2E73H85i92Mv8JQYk0K9vz09os=
+go.opentelemetry.io/proto/otlp v1.7.0/go.mod
h1:fSKjH6YJ7HDlwzltzyMj036AJ3ejJLCgCSHGj4efDDo=
go.starlark.net v0.0.0-20230302034142-4b1e35fe2254
h1:Ss6D3hLXTM0KobyBYEAygXzFfGcjnmfEJOBgSbemCtg=
go.starlark.net v0.0.0-20230302034142-4b1e35fe2254/go.mod
h1:jxU+3+j+71eXOW14274+SmmuW82qJzl6iZSeqEtTGds=
go.uber.org/atomic v1.7.0/go.mod
h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
@@ -833,6 +846,10 @@ golang.org/x/tools
v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4f
golang.org/x/tools v0.1.12/go.mod
h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
golang.org/x/tools v0.36.0 h1:kWS0uv/zsvHEle1LbV5LE8QujrxB3wfQyxHfhOk0Qkg=
golang.org/x/tools v0.36.0/go.mod
h1:WBDiHKJK8YgLHlcQPYQzNCkUxUypCaa5ZegCVutKm+s=
+golang.org/x/tools/go/expect v0.1.1-deprecated
h1:jpBZDwmgPhXsKZC6WhL20P4b/wmnpsEAGHaNy0n/rJM=
+golang.org/x/tools/go/expect v0.1.1-deprecated/go.mod
h1:eihoPOH+FgIqa3FpoTwguz/bVUSGBlGQU67vpBeOrBY=
+golang.org/x/tools/go/packages/packagestest v0.1.1-deprecated
h1:1h2MnaIAIXISqTFKdENegdpAgUXz6NrPEsbIeWaBRvM=
+golang.org/x/tools/go/packages/packagestest v0.1.1-deprecated/go.mod
h1:RVAQXBGNv1ib0J382/DPCRS/BPnsGebyM1Gj5VSDpG8=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod
h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod
h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod
h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -885,6 +902,7 @@ gopkg.in/inf.v0 v0.9.1/go.mod
h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=
gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7
h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod
h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME=
gopkg.in/warnings.v0 v0.1.2/go.mod
h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=
@@ -911,10 +929,14 @@ k8s.io/apiextensions-apiserver v0.34.1
h1:NNPBva8FNAPt1iSVwIE0FsdrVriRXMsaWFMqJb
k8s.io/apiextensions-apiserver v0.34.1/go.mod
h1:hP9Rld3zF5Ay2Of3BeEpLAToP+l4s5UlxiHfqRaRcMc=
k8s.io/apimachinery v0.34.1 h1:dTlxFls/eikpJxmAC7MVE8oOeP1zryV7iRyIjB0gky4=
k8s.io/apimachinery v0.34.1/go.mod
h1:/GwIlEcWuTX9zKIg2mbw0LRFIsXwrfoVxn+ef0X13lw=
+k8s.io/apiserver v0.34.1 h1:U3JBGdgANK3dfFcyknWde1G6X1F4bg7PXuvlqt8lITA=
+k8s.io/apiserver v0.34.1/go.mod h1:eOOc9nrVqlBI1AFCvVzsob0OxtPZUCPiUJL45JOTBG0=
k8s.io/cli-runtime v0.33.3 h1:Dgy4vPjNIu8LMJBSvs8W0LcdV0PX/8aGG1DA1W8lklA=
k8s.io/cli-runtime v0.33.3/go.mod
h1:yklhLklD4vLS8HNGgC9wGiuHWze4g7x6XQZ+8edsKEo=
k8s.io/client-go v0.34.1 h1:ZUPJKgXsnKwVwmKKdPfw4tB58+7/Ik3CrjOEhsiZ7mY=
k8s.io/client-go v0.34.1/go.mod h1:kA8v0FP+tk6sZA0yKLRG67LWjqufAoSHA2xVGKw9Of8=
+k8s.io/component-base v0.34.1 h1:v7xFgG+ONhytZNFpIz5/kecwD+sUhVE6HU7qQUiRM4A=
+k8s.io/component-base v0.34.1/go.mod
h1:mknCpLlTSKHzAQJJnnHVKqjxR7gBeHRv0rPXA7gdtQ0=
k8s.io/gengo v0.0.0-20251215205346-5ee0d033ba5b
h1:X0Afwan8Q1l7bMcNgh6DAah2jKCQ2irT7EoAXIChFqk=
k8s.io/gengo v0.0.0-20251215205346-5ee0d033ba5b/go.mod
h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
@@ -928,6 +950,8 @@ k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d
h1:wAhiDyZ4Tdtt7e46e9M5ZSAJ/MnPG
k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d/go.mod
h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
nhooyr.io/websocket v1.8.7 h1:usjR2uOr/zjjkVMy0lW+PPohFok7PCow5sDjLgX4P4g=
nhooyr.io/websocket v1.8.7/go.mod
h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0=
+sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2
h1:jpcvIRr3GLoUoEKRkHKSmGjxb6lWwrBlJsXc+eUYQHM=
+sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2/go.mod
h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw=
sigs.k8s.io/controller-tools v0.19.0
h1:OU7jrPPiZusryu6YK0jYSjPqg8Vhf8cAzluP9XGI5uk=
sigs.k8s.io/controller-tools v0.19.0/go.mod
h1:y5HY/iNDFkmFla2CfQoVb2AQXMsBk4ad84iR1PLANB0=
sigs.k8s.io/gateway-api v1.4.1 h1:NPxFutNkKNa8UfLd2CMlEuhIPMQgDQ6DXNKG9sHbJU8=
diff --git a/manifests/charts/base/files/crd-all.gen.yaml
b/manifests/charts/base/files/crd-all.gen.yaml
index 0c6c1dea..04730e6f 100644
--- a/manifests/charts/base/files/crd-all.gen.yaml
+++ b/manifests/charts/base/files/crd-all.gen.yaml
@@ -5,7 +5,7 @@ metadata:
annotations:
"helm.sh/resource-policy": keep
labels:
- app: dubbo-planet
+ app: dubbo
chart: dubbo
heritage: Tiller
release: dubbo
@@ -139,7 +139,7 @@ metadata:
annotations:
"helm.sh/resource-policy": keep
labels:
- app: dubbo-planet
+ app: dubbo
chart: dubbo
heritage: Tiller
release: dubbo
@@ -258,7 +258,7 @@ metadata:
annotations:
"helm.sh/resource-policy": keep
labels:
- app: dubbo-planet
+ app: dubbo
chart: dubbo
dubbo: security
heritage: Tiller
diff --git a/manifests/charts/dubbo-control/dubbo-discovery/files/gateway.yaml
b/manifests/charts/dubbo-control/dubbo-discovery/files/gateway.yaml
index 01a0a2c3..66896c7a 100644
--- a/manifests/charts/dubbo-control/dubbo-discovery/files/gateway.yaml
+++ b/manifests/charts/dubbo-control/dubbo-discovery/files/gateway.yaml
@@ -61,7 +61,7 @@ spec:
- --domain
- $(POD_NAMESPACE).svc.cluster.local
env:
- - name: PLANET_CERT_PROVIDER
+ - name: DUBBO_CERT_PROVIDER
value: dubbod
- name: CA_ADDR
value: dubbod.dubbo-system.svc:15012
diff --git
a/manifests/charts/dubbo-control/dubbo-discovery/files/grpc-agent.yaml
b/manifests/charts/dubbo-control/dubbo-discovery/files/grpc-agent.yaml
index 620e12c8..744dee17 100644
--- a/manifests/charts/dubbo-control/dubbo-discovery/files/grpc-agent.yaml
+++ b/manifests/charts/dubbo-control/dubbo-discovery/files/grpc-agent.yaml
@@ -38,7 +38,7 @@ spec:
postStart:
exec:
command:
- - planet-agent
+ - dubbo-agent
- wait
- --url=http://localhost:15020/healthz/ready
readinessProbe:
@@ -58,7 +58,7 @@ spec:
value: /etc/dubbo/proxy/grpc-bootstrap.json
- name: OUTPUT_CERTS
value: /var/lib/dubbo/data
- - name: PLANET_CERT_PROVIDER
+ - name: DUBBO_CERT_PROVIDER
value: dubbod
- name: DUBBO_META_CLUSTER_ID
value: Kubernetes
diff --git
a/manifests/charts/dubbo-control/dubbo-discovery/templates/deployment.yaml
b/manifests/charts/dubbo-control/dubbo-discovery/templates/deployment.yaml
index bc965ba7..95fad726 100644
--- a/manifests/charts/dubbo-control/dubbo-discovery/templates/deployment.yaml
+++ b/manifests/charts/dubbo-control/dubbo-discovery/templates/deployment.yaml
@@ -41,7 +41,7 @@ spec:
env:
- name: REVISION
value: default
- - name: PLANET_CERT_PROVIDER
+ - name: DUBBO_CERT_PROVIDER
value: dubbod
- name: CLUSTER_ID
value: "Kubernetes"
diff --git a/manifests/charts/dubbo-control/dubbo-discovery/values.yaml
b/manifests/charts/dubbo-control/dubbo-discovery/values.yaml
index 991d319f..7ef132da 100644
--- a/manifests/charts/dubbo-control/dubbo-discovery/values.yaml
+++ b/manifests/charts/dubbo-control/dubbo-discovery/values.yaml
@@ -32,7 +32,7 @@ _internal_default_values_not_set:
global:
dubboNamespace: dubbo-system
- planetCertProvider: dubbod
+ dubboCertProvider: dubbod
proxy:
image: ""
diff --git a/manifests/profiles/default.yaml b/manifests/profiles/default.yaml
index 51d7ea59..4dcded86 100644
--- a/manifests/profiles/default.yaml
+++ b/manifests/profiles/default.yaml
@@ -28,7 +28,7 @@ spec:
zookeeper:
enabled: false
discovery:
- planet:
+ dubbo:
enabled: true
dashboard:
admin:
diff --git a/operator/pkg/apis/types.go b/operator/pkg/apis/types.go
index dda08517..4aeba903 100644
--- a/operator/pkg/apis/types.go
+++ b/operator/pkg/apis/types.go
@@ -56,7 +56,7 @@ type DubboComponentSpec struct {
Base *BaseComponentSpec `json:"base,omitempty"`
// Using Zookeeper and Nacos as the registration plane.
Register *RegisterSpec `json:"register,omitempty"`
- // Using Planet as the control plane.
+ // Using Dubbo as the control plane.
Discovery *DiscoverySpec `json:"discovery,omitempty"`
}
@@ -72,8 +72,8 @@ type RegisterSpec struct {
}
type DiscoverySpec struct {
- // Planet component
- Planet *DiscoveryComponentSpec `json:"planet,omitempty"`
+ // Dubbo component
+ Dubbo *DiscoveryComponentSpec `json:"dubbo,omitempty"`
}
type BaseComponentSpec struct {
diff --git a/operator/pkg/component/component.go
b/operator/pkg/component/component.go
index 6da301f9..55f6c21d 100644
--- a/operator/pkg/component/component.go
+++ b/operator/pkg/component/component.go
@@ -28,8 +28,7 @@ const (
BaseComponentName Name = "Base"
NacosRegisterComponentName Name = "Nacos"
ZookeeperRegisterComponentName Name = "Zookeeper"
- AdminComponentName Name = "Admin"
- PlanetDiscoveryComponentName Name = "Planet"
+ DubboDiscoveryComponentName Name = "Dubbo-Discovery"
)
type Component struct {
@@ -70,14 +69,14 @@ var AllComponents = []Component{
HelmValuesTreeRoot: "admin",
},
{
- UserFacingName: PlanetDiscoveryComponentName,
- SpecName: "planet",
+ UserFacingName: DubboDiscoveryComponentName,
+ SpecName: "dubbo",
ResourceType: "Deployment",
ResourceName: "dubbod",
ContainerName: "dubbo-discovery",
Default: true,
HelmSubDir: "dubbo-control/dubbo-discovery",
- HelmValuesTreeRoot: "planet",
+ HelmValuesTreeRoot: "dubbo-discovery",
},
{
UserFacingName: NacosRegisterComponentName,
@@ -104,7 +103,7 @@ var AllComponents = []Component{
var (
userFacingCompNames = map[Name]string{
BaseComponentName: "Dubbo Resource Core",
- PlanetDiscoveryComponentName: "Dubbo Control Plane",
+ DubboDiscoveryComponentName: "Dubbo Control Plane",
NacosRegisterComponentName: "Nacos Register Plane",
ZookeeperRegisterComponentName: "Zookeeper Register Plane",
AdminComponentName: "Admin Dashboard",
@@ -115,7 +114,7 @@ var (
NacosRegisterComponentName: "🔨",
ZookeeperRegisterComponentName: "🔧️",
AdminComponentName: "🔭",
- PlanetDiscoveryComponentName: "🪐",
+ DubboDiscoveryComponentName: "🪐",
}
)
diff --git a/operator/pkg/install/installer.go
b/operator/pkg/install/installer.go
index 73415b19..73af8584 100644
--- a/operator/pkg/install/installer.go
+++ b/operator/pkg/install/installer.go
@@ -253,13 +253,13 @@ func (i Installer) prune(manifests
[]manifest.ManifestSet) error {
}
var componentDependencies = map[component.Name][]component.Name{
- component.PlanetDiscoveryComponentName: {
+ component.DubboDiscoveryComponentName: {
component.AdminComponentName,
},
component.NacosRegisterComponentName: {},
component.ZookeeperRegisterComponentName: {},
component.BaseComponentName: {
- component.PlanetDiscoveryComponentName,
+ component.DubboDiscoveryComponentName,
component.NacosRegisterComponentName,
component.ZookeeperRegisterComponentName,
},
diff --git a/operator/pkg/uninstall/prune.go b/operator/pkg/uninstall/prune.go
index 68b5e29d..609c7fad 100644
--- a/operator/pkg/uninstall/prune.go
+++ b/operator/pkg/uninstall/prune.go
@@ -96,7 +96,7 @@ func GetRemovedResources(kc kube.CLIClient, dopName,
dopNamespace string, includ
result, err = c.List(context.Background(),
metav1.ListOptions{LabelSelector: s.Add(*compReq).String()})
} else {
includeCN := []string{
- string(component.PlanetDiscoveryComponentName),
+ string(component.DubboDiscoveryComponentName),
}
includeRequirement, lerr :=
klabels.NewRequirement(manifest.DubboComponentLabel, selection.In, includeCN)
if lerr != nil {
diff --git a/pkg/adsc/adsc.go b/pkg/adsc/adsc.go
index b5fa6595..80206f46 100644
--- a/pkg/adsc/adsc.go
+++ b/pkg/adsc/adsc.go
@@ -183,11 +183,11 @@ func setDefaultConfig(config *Config) Config {
}
func ConfigInitialRequests() []*discovery.DiscoveryRequest {
- out := make([]*discovery.DiscoveryRequest, 0,
len(collections.Planet.All())+1)
+ out := make([]*discovery.DiscoveryRequest, 0,
len(collections.Dubbo.All())+1)
out = append(out, &discovery.DiscoveryRequest{
TypeUrl: gvk.MeshGlobalConfig.String(),
})
- for _, sch := range collections.Planet.All() {
+ for _, sch := range collections.Dubbo.All() {
out = append(out, &discovery.DiscoveryRequest{
TypeUrl: sch.GroupVersionKind().String(),
})
diff --git a/pkg/bootstrap/config.go b/pkg/bootstrap/config.go
index 6592b138..b3908e9a 100644
--- a/pkg/bootstrap/config.go
+++ b/pkg/bootstrap/config.go
@@ -47,7 +47,7 @@ type MetadataOptions struct {
InstanceIPs []string
StsPort int
ProxyConfig *meshAPI.ProxyConfig
- PlanetSubjectAltName []string
+ DubboSubjectAltName []string
CredentialSocketExists bool
XDSRootCert string
annotationFilePath string
@@ -125,7 +125,7 @@ func GetNodeMetaData(options MetadataOptions) (*model.Node,
error) {
}
meta.ProxyConfig = (*model.NodeMetaProxyConfig)(options.ProxyConfig)
- meta.PlanetSubjectAltName = options.PlanetSubjectAltName
+ meta.DubboSubjectAltName = options.DubboSubjectAltName
meta.XDSRootCert = options.XDSRootCert
if options.CredentialSocketExists {
untypedMeta[security.CredentialMetaDataName] = "true"
diff --git a/pkg/config/constants/constants.go
b/pkg/config/constants/constants.go
index 2df004ef..ef71031a 100644
--- a/pkg/config/constants/constants.go
+++ b/pkg/config/constants/constants.go
@@ -40,15 +40,15 @@ const (
StatPrefixDelimiter = ";"
- PlanetWellKnownDNSCertPath = "./var/run/secrets/dubbod/tls/"
- PlanetWellKnownDNSCaCertPath = "./var/run/secrets/dubbod/ca/"
-
- ConfigPathDir = "./etc/dubbo/proxy"
- KeyFilename = "key.pem"
- DefaultPlanetTLSCert = PlanetWellKnownDNSCertPath +
"tls.crt"
- DefaultPlanetTLSKey = PlanetWellKnownDNSCertPath +
"tls.key"
- DefaultPlanetTLSCaCert = PlanetWellKnownDNSCaCertPath +
"root-cert.pem"
- DefaultPlanetTLSCaCertAlternatePath = PlanetWellKnownDNSCertPath +
"ca.crt"
+ DubboWellKnownDNSCertPath = "./var/run/secrets/dubbod/tls/"
+ DubboWellKnownDNSCaCertPath = "./var/run/secrets/dubbod/ca/"
+
+ ConfigPathDir = "./etc/dubbo/proxy"
+ KeyFilename = "key.pem"
+ DefaultDubboTLSCert = DubboWellKnownDNSCertPath +
"tls.crt"
+ DefaultDubboTLSKey = DubboWellKnownDNSCertPath +
"tls.key"
+ DefaultDubboTLSCaCert = DubboWellKnownDNSCaCertPath +
"root-cert.pem"
+ DefaultDubboTLSCaCertAlternatePath = DubboWellKnownDNSCertPath +
"ca.crt"
AlwaysReject = "internal.dubbo.apache.org/webhook-always-reject"
diff --git a/pkg/config/schema/collections/collections.agent.go
b/pkg/config/schema/collections/collections.agent.go
index 5c29d2aa..79ad81db 100644
--- a/pkg/config/schema/collections/collections.agent.go
+++ b/pkg/config/schema/collections/collections.agent.go
@@ -144,17 +144,17 @@ var (
ValidateProto: validation.EmptyValidate,
}.MustBuild()
- Planet = collection.NewSchemasBuilder().
+ Dubbo = collection.NewSchemasBuilder().
MustAdd(PeerAuthentication).
MustAdd(DestinationRule).
MustAdd(VirtualService).
Build()
- planetGatewayAPI = collection.NewSchemasBuilder().
- MustAdd(GatewayClass).
- MustAdd(Gateway).
- MustAdd(HTTPRoute).
- Build()
+ dubboGatewayAPI = collection.NewSchemasBuilder().
+ MustAdd(GatewayClass).
+ MustAdd(Gateway).
+ MustAdd(HTTPRoute).
+ Build()
All = collection.NewSchemasBuilder().
MustAdd(PeerAuthentication).
diff --git a/pkg/config/schema/collections/collections.go
b/pkg/config/schema/collections/collections.go
index 4c4d4c1f..e11f9b67 100644
--- a/pkg/config/schema/collections/collections.go
+++ b/pkg/config/schema/collections/collections.go
@@ -144,17 +144,17 @@ var (
ValidateProto: validation.EmptyValidate,
}.MustBuild()
- Planet = collection.NewSchemasBuilder().
+ Dubbo = collection.NewSchemasBuilder().
MustAdd(PeerAuthentication).
MustAdd(DestinationRule).
MustAdd(VirtualService).
Build()
- planetGatewayAPI = collection.NewSchemasBuilder().
- MustAdd(GatewayClass).
- MustAdd(Gateway).
- MustAdd(HTTPRoute).
- Build()
+ dubboGatewayAPI = collection.NewSchemasBuilder().
+ MustAdd(GatewayClass).
+ MustAdd(Gateway).
+ MustAdd(HTTPRoute).
+ Build()
All = collection.NewSchemasBuilder().
MustAdd(PeerAuthentication).
diff --git a/pkg/config/schema/collections/gateway.go
b/pkg/config/schema/collections/gateway.go
index e6999156..4d2ff3b8 100644
--- a/pkg/config/schema/collections/gateway.go
+++ b/pkg/config/schema/collections/gateway.go
@@ -20,6 +20,6 @@ import (
"github.com/apache/dubbo-kubernetes/pkg/config/schema/collection"
)
-func PlanetGatewayAPI() collection.Schemas {
- return planetGatewayAPI
+func DubboGatewayAPI() collection.Schemas {
+ return dubboGatewayAPI
}
diff --git a/pkg/dubboagent/agent.go b/pkg/dubboagent/agent.go
index 4115fc55..e1ea26f4 100644
--- a/pkg/dubboagent/agent.go
+++ b/pkg/dubboagent/agent.go
@@ -156,7 +156,7 @@ func (a *Agent) Run(ctx context.Context) (func(), error) {
var bootstrapNode *core.Node
if a.cfg.GRPCBootstrapPath != "" {
- log.Infof("Starting planet-agent with GRPC bootstrap path: %s",
a.cfg.GRPCBootstrapPath)
+ log.Infof("Starting dubbo-agent with GRPC bootstrap path: %s",
a.cfg.GRPCBootstrapPath)
node, err := a.generateGRPCBootstrapWithNode()
if err != nil {
return nil, fmt.Errorf("failed generating gRPC XDS
bootstrap: %v", err)
@@ -279,7 +279,7 @@ func (a *Agent) FindRootCAForXDS() (string, error) {
} else if a.secOpts.FileMountedCerts {
// FileMountedCerts - Load it from Proxy Metadata.
rootCAPath = a.proxyConfig.ProxyMetadata[MetadataClientRootCert]
- } else if a.secOpts.PlanetCertProvider == constants.CertProviderNone {
+ } else if a.secOpts.DubboCertProvider == constants.CertProviderNone {
return "", fmt.Errorf("root CA file for XDS required but
configured provider as none")
} else {
rootCAPath = path.Join(DubboCACertPath,
constants.CACertNamespaceConfigMapDataName)
@@ -319,7 +319,7 @@ func (a *Agent) FindRootCAForCA() (string, error) {
return "", nil
} else if a.cfg.CARootCerts != "" {
rootCAPath = a.cfg.CARootCerts
- } else if a.secOpts.PlanetCertProvider == constants.CertProviderCustom {
+ } else if a.secOpts.DubboCertProvider == constants.CertProviderCustom {
rootCAPath = security.DefaultRootCertFilePath //
./etc/certs/root-cert.pem
} else if a.secOpts.ProvCert != "" {
// This was never completely correct - PROV_CERT are only
intended for auth with CA_ADDR,
@@ -327,7 +327,7 @@ func (a *Agent) FindRootCAForCA() (string, error) {
// For VMs, the root cert file used to auth may be populated
afterwards.
// Thus, return directly here and skip checking for existence.
return a.secOpts.ProvCert + "/root-cert.pem", nil
- } else if a.secOpts.PlanetCertProvider == constants.CertProviderNone {
+ } else if a.secOpts.DubboCertProvider == constants.CertProviderNone {
return "", fmt.Errorf("root CA file for CA required but
configured provider as none")
} else {
rootCAPath = path.Join(DubboCACertPath,
constants.CACertNamespaceConfigMapDataName)
@@ -529,9 +529,9 @@ func (a *Agent) newSecretManager(createCaClient bool)
(*cache.SecretManagerClien
}
func (a *Agent) generateNodeMetadata() (*model.Node, error) {
- var planetSAN []string
+ var dubboSAN []string
if a.proxyConfig.ControlPlaneAuthPolicy ==
mesh.AuthenticationPolicy_MUTUAL_TLS {
- planetSAN =
[]string{config.GetPlanetSan(a.proxyConfig.DiscoveryAddress)}
+ dubboSAN =
[]string{config.GetDubboSan(a.proxyConfig.DiscoveryAddress)}
}
credentialSocketExists, err := checkSocket(context.TODO(),
security.CredentialNameSocketPath)
@@ -548,7 +548,7 @@ func (a *Agent) generateNodeMetadata() (*model.Node, error)
{
InstanceIPs: a.cfg.ProxyIPAddresses,
StsPort: a.secOpts.STSPort,
ProxyConfig: a.proxyConfig,
- PlanetSubjectAltName: planetSAN,
+ DubboSubjectAltName: dubboSAN,
CredentialSocketExists: credentialSocketExists,
XDSRootCert: a.cfg.XDSRootCerts,
MetadataDiscovery: a.cfg.MetadataDiscovery,
diff --git a/pkg/dubboagent/grpcxds/grpc_bootstrap.go
b/pkg/dubboagent/grpcxds/grpc_bootstrap.go
index 08070949..00a56768 100644
--- a/pkg/dubboagent/grpcxds/grpc_bootstrap.go
+++ b/pkg/dubboagent/grpcxds/grpc_bootstrap.go
@@ -217,7 +217,7 @@ func extractMeta(node *model.Node) (*structpb.Struct,
error) {
}
// Fix ClusterName oneof field in PROXY_CONFIG to be a string instead
of object
- // This is needed because planet-discovery expects ClusterName as a
string, not a oneof object
+ // This is needed because dubbo-discovery expects ClusterName as a
string, not a oneof object
if proxyConfigRaw, ok := rawMeta["PROXY_CONFIG"].(map[string]any); ok {
if clusterNameRaw, ok :=
proxyConfigRaw["ClusterName"].(map[string]any); ok {
// Convert {"ServiceCluster": "dubbo-proxy"} to just
"dubbo-proxy"
diff --git a/pkg/dubboagent/xds_proxy.go b/pkg/dubboagent/xds_proxy.go
index b7da3336..f7e2ff30 100644
--- a/pkg/dubboagent/xds_proxy.go
+++ b/pkg/dubboagent/xds_proxy.go
@@ -387,7 +387,7 @@ func (p *XdsProxy) handleUpstreamRequest(con
*ProxyConnection) {
con.nodeMutex.RUnlock()
// For XDS, any first request (not just LDS) without
Node should wait
- // because planet-discovery needs Node in the first
request to initialize connection
+ // because dubbo-discovery needs Node in the first
request to initialize connection
if !nodeReceived.Load() && req.Node == nil &&
req.TypeUrl != model.HealthInfoType {
proxyLog.Debugf("connection #%d received first
request without Node (TypeUrl=%s), waiting for Node information", con.conID,
model.GetShortType(req.TypeUrl))
continue
diff --git a/pkg/dubboagent/xds_proxy_delta.go
b/pkg/dubboagent/xds_proxy_delta.go
index cd41545a..08946da6 100644
--- a/pkg/dubboagent/xds_proxy_delta.go
+++ b/pkg/dubboagent/xds_proxy_delta.go
@@ -155,7 +155,7 @@ func (p *XdsProxy) handleUpstreamDeltaRequest(con
*ProxyConnection) {
con.nodeMutex.RUnlock()
// For Delta XDS, any first request (not just LDS)
without Node should wait
- // because planet-discovery needs Node in the first
request to initialize connection
+ // because dubbo-discovery needs Node in the first
request to initialize connection
if !nodeReceived.Load() && req.Node == nil &&
req.TypeUrl != model.HealthInfoType {
proxyLog.Debugf("delta connection #%d received
first request without Node (TypeUrl=%s), waiting for Node information",
con.conID, model.GetShortType(req.TypeUrl))
continue
diff --git a/pkg/model/proxy.go b/pkg/model/proxy.go
index 2259ce0e..ec64951a 100644
--- a/pkg/model/proxy.go
+++ b/pkg/model/proxy.go
@@ -59,14 +59,14 @@ type Node struct {
}
type NodeMetadata struct {
- Generator string `json:"GENERATOR,omitempty"`
- ClusterID cluster.ID `json:"CLUSTER_ID,omitempty"`
- Namespace string `json:"NAMESPACE,omitempty"`
- StsPort string `json:"STS_PORT,omitempty"`
- MetadataDiscovery *StringBool
`json:"METADATA_DISCOVERY,omitempty"`
- ProxyConfig *NodeMetaProxyConfig
`json:"PROXY_CONFIG,omitempty"`
- PlanetSubjectAltName []string `json:"PLANET_SAN,omitempty"`
- XDSRootCert string `json:"-"`
+ Generator string `json:"GENERATOR,omitempty"`
+ ClusterID cluster.ID `json:"CLUSTER_ID,omitempty"`
+ Namespace string `json:"NAMESPACE,omitempty"`
+ StsPort string `json:"STS_PORT,omitempty"`
+ MetadataDiscovery *StringBool
`json:"METADATA_DISCOVERY,omitempty"`
+ ProxyConfig *NodeMetaProxyConfig `json:"PROXY_CONFIG,omitempty"`
+ DubboSubjectAltName []string `json:"DUBBO_SAN,omitempty"`
+ XDSRootCert string `json:"-"`
}
type BootstrapNodeMetadata struct {
diff --git a/pkg/security/security.go b/pkg/security/security.go
index 82c302d7..f2dac62a 100644
--- a/pkg/security/security.go
+++ b/pkg/security/security.go
@@ -110,7 +110,7 @@ type Options struct {
ServeOnlyFiles bool
ProvCert string
FileMountedCerts bool
- PlanetCertProvider string
+ DubboCertProvider string
OutputKeyCertToDir string
CertChainFilePath string
KeyFilePath string
diff --git a/tools/build-tools/docker/Dockerfile
b/tools/build-tools/docker/Dockerfile
index b9c80c08..94c06ca7 100644
--- a/tools/build-tools/docker/Dockerfile
+++ b/tools/build-tools/docker/Dockerfile
@@ -78,8 +78,8 @@ FROM binary_tools_context_base AS go_tools_2
# Build Dubbo Kubernetes kubetype-gen and protoc-gen-crd tool from source.
# Copy pre-built kubetype-gen binary from project root
-COPY --chmod=755 ./tools/bin/kubetype-gen /tmp/go/bin/kubetype-gen
-COPY --chmod=755 ./tools/bin/protoc-gen-crd /tmp/go/bin/protoc-gen-crd
+COPY --chmod=755 ./tools/cmd/bin/kubetype-gen /tmp/go/bin/kubetype-gen
+COPY --chmod=755 ./tools/cmd/bin/protoc-gen-crd /tmp/go/bin/protoc-gen-crd
FROM ubuntu:noble AS base_os_context
