fix universal buf
diff --git a/conf/dubbo-cp.yaml b/conf/dubbo-cp.yaml
index e82a723..b29eb01 100644
--- a/conf/dubbo-cp.yaml
+++ b/conf/dubbo-cp.yaml
@@ -14,7 +14,8 @@
# limitations under the License.
# 可选 k8s half universal
-deploy_mode: k8s
+deploy_mode: universal
+mode: test
runtime:
kubernetes:
admissionServer:
diff --git a/pkg/core/governance/governance_config.go b/pkg/core/governance/governance_config.go
index 382b872..aa89969 100644
--- a/pkg/core/governance/governance_config.go
+++ b/pkg/core/governance/governance_config.go
@@ -25,10 +25,6 @@
"dubbo.apache.org/dubbo-go/v3/common"
"dubbo.apache.org/dubbo-go/v3/config_center"
"dubbo.apache.org/dubbo-go/v3/registry"
-
- gozk "github.com/dubbogo/go-zookeeper/zk"
-
- perrors "github.com/pkg/errors"
)
const group = "dubbo"
@@ -158,9 +154,6 @@
}
rule, err := zk.configCenter.GetRule(key, config_center.WithGroup(zk.group))
if err != nil {
- if perrors.Is(err, gozk.ErrNoNode) {
- return "", &RuleNotFound{err}
- }
return "", err
}
return rule, nil
@@ -173,9 +166,6 @@
}
err := zk.configCenter.PublishConfig(key, zk.group, value)
if err != nil {
- if perrors.Is(err, gozk.ErrNodeExists) {
- return &RuleExists{err}
- }
return err
}
return nil
diff --git a/pkg/core/managers/apis/dataplane/dataplane_manager.go b/pkg/core/managers/apis/dataplane/dataplane_manager.go
index 7ec8cba..036a0ef 100644
--- a/pkg/core/managers/apis/dataplane/dataplane_manager.go
+++ b/pkg/core/managers/apis/dataplane/dataplane_manager.go
@@ -132,6 +132,10 @@
}
func (m *dataplaneManager) setHealth(dp *core_mesh.DataplaneResource) {
+ if m.zone == "" || dp.Spec.Networking == nil {
+ return
+ }
+
for _, inbound := range dp.Spec.Networking.Inbound {
if inbound.ServiceProbe != nil {
inbound.State = mesh_proto.Dataplane_Networking_Inbound_NotReady
@@ -143,4 +147,9 @@
}
}
-func (m *dataplaneManager) setExtensions(dp *core_mesh.DataplaneResource) {}
+func (m *dataplaneManager) setExtensions(dp *core_mesh.DataplaneResource) {
+ if m.zone == "" || dp.Spec.Networking == nil {
+ return
+ }
+
+}
diff --git a/pkg/plugins/resources/traditional/store.go b/pkg/plugins/resources/traditional/store.go
index 1d5edd4..0139fd4 100644
--- a/pkg/plugins/resources/traditional/store.go
+++ b/pkg/plugins/resources/traditional/store.go
@@ -20,6 +20,7 @@
import (
"context"
"fmt"
+ "github.com/dubbogo/go-zookeeper/zk"
"sync"
)
@@ -582,6 +583,9 @@
path := mesh_proto.GetRoutePath(id, consts.TagRoute)
cfg, err := c.governance.GetConfig(path)
if err != nil {
+ if errors.Is(err, zk.ErrNoNode) {
+ return nil
+ }
return err
}
if cfg != "" {
@@ -606,6 +610,9 @@
path := mesh_proto.GetRoutePath(id, consts.ConditionRoute)
cfg, err := c.governance.GetConfig(path)
if err != nil {
+ if errors.Is(err, zk.ErrNoNode) {
+ return nil
+ }
return err
}
if cfg != "" {
@@ -630,6 +637,9 @@
path := mesh_proto.GetOverridePath(id)
cfg, err := c.governance.GetConfig(path)
if err != nil {
+ if errors.Is(err, zk.ErrNoNode) {
+ return nil
+ }
return err
}
if cfg != "" {
@@ -646,6 +656,9 @@
key := opts.Name
set, err := c.metadataReport.GetServiceAppMapping(key, mappingGroup, nil)
if err != nil {
+ if errors.Is(err, zk.ErrNoNode) {
+ return nil
+ }
return err
}
meta := &resourceMetaObject{
@@ -672,6 +685,9 @@
if revision == "" {
children, err := c.regClient.GetChildren(getMetadataPath(app))
if err != nil {
+ if errors.Is(err, zk.ErrNoNode) {
+ return nil
+ }
return err
}
revision = children[0]
@@ -679,6 +695,9 @@
id := dubbo_identifier.NewSubscriberMetadataIdentifier(app, revision)
appMetadata, err := c.metadataReport.GetAppMetadata(id)
if err != nil {
+ if errors.Is(err, zk.ErrNoNode) {
+ return nil
+ }
return err
}
metaData := resource.GetSpec().(*mesh_proto.MetaData)
@@ -704,6 +723,9 @@
path := GenerateCpGroupPath(string(resource.Descriptor().Name), opts.Name)
value, err := c.regClient.GetContent(path)
if err != nil {
+ if errors.Is(err, zk.ErrNoNode) {
+ return nil
+ }
return err
}
if err := core_model.FromYAML(value, resource.GetSpec()); err != nil {
@@ -742,6 +764,9 @@
// 1. 首先获取到所有到key
keys, err := c.metadataReport.GetConfigKeysByGroup(mappingGroup)
if err != nil {
+ if errors.Is(err, zk.ErrNoNode) {
+ return nil
+ }
return err
}
for _, key := range keys.Values() {
@@ -749,6 +774,9 @@
// 通过key得到所有的mapping映射关系
set, err := c.metadataReport.GetServiceAppMapping(key, mappingGroup, nil)
if err != nil {
+ if errors.Is(err, zk.ErrNoNode) {
+ return nil
+ }
return err
}
meta := &resourceMetaObject{
@@ -774,6 +802,9 @@
rootDir := getMetadataPath()
appNames, err := c.regClient.GetChildren(rootDir)
if err != nil {
+ if errors.Is(err, zk.ErrNoNode) {
+ return nil
+ }
return err
}
for _, app := range appNames {
@@ -781,6 +812,9 @@
path := getMetadataPath(app)
revisions, err := c.regClient.GetChildren(path)
if err != nil {
+ if errors.Is(err, zk.ErrNoNode) {
+ return nil
+ }
return err
}
if revisions[0] == "provider" ||
@@ -791,6 +825,9 @@
id := dubbo_identifier.NewSubscriberMetadataIdentifier(app, revision)
appMetadata, err := c.metadataReport.GetAppMetadata(id)
if err != nil {
+ if errors.Is(err, zk.ErrNoNode) {
+ return nil
+ }
return err
}
item := resources.NewItem()
@@ -830,12 +867,18 @@
rootDir := getDubboCpPath(string(resources.GetItemType()))
names, err := c.regClient.GetChildren(rootDir)
if err != nil {
+ if errors.Is(err, zk.ErrNoNode) {
+ return nil
+ }
return err
}
for _, name := range names {
path := getDubboCpPath(string(resources.GetItemType()), name)
bytes, err := c.regClient.GetContent(path)
if err != nil {
+ if errors.Is(err, zk.ErrNoNode) {
+ return nil
+ }
return err
}
item := resources.NewItem()
diff --git a/test/app/consumer/deployment.yaml b/test/app/consumer/deployment.yaml
index 86642c2..ec83ebf 100644
--- a/test/app/consumer/deployment.yaml
+++ b/test/app/consumer/deployment.yaml
@@ -53,4 +53,4 @@
path: /startup
port: 22222
failureThreshold: 30
- periodSeconds: 10
\ No newline at end of file
+ periodSeconds: 10
