remove istio (#49)
* upgrade github.com/apache/dubbo-go-pixiu to v1.0.0-rc2
(cherry picked from commit c89bcc3097781377838fed090ea8368ff3ea5774)
* upgrade github.com/apache/dubbo-go-pixiu to v1.0.0-rc2
* upgrade github.com/apache/dubbo-go-pixiu to v1.0.0-rc2
* remove istio
diff --git a/dubbogo/simple/body/server/app/server.go b/dubbogo/simple/body/server/app/server.go
index 3469412..f8ebcd3 100644
--- a/dubbogo/simple/body/server/app/server.go
+++ b/dubbogo/simple/body/server/app/server.go
@@ -26,7 +26,6 @@
)
import (
- "dubbo.apache.org/dubbo-go/v3/common/logger"
"dubbo.apache.org/dubbo-go/v3/config"
_ "dubbo.apache.org/dubbo-go/v3/imports"
)
@@ -34,11 +33,11 @@
var survivalTimeout = int(3e9)
// they are necessary:
-// export CONF_PROVIDER_FILE_PATH="xxx"
-// export APP_LOG_CONF_FILE="xxx"
+//
+// export CONF_PROVIDER_FILE_PATH="xxx"
+// export APP_LOG_CONF_FILE="xxx"
func main() {
config.Load()
- logger.Infof("dubbo version is: %s", Version)
initSignal()
}
@@ -48,13 +47,11 @@
signal.Notify(signals, os.Interrupt, syscall.SIGHUP, syscall.SIGQUIT, syscall.SIGTERM, syscall.SIGINT)
for {
sig := <-signals
- logger.Infof("get signal %s", sig.String())
switch sig {
case syscall.SIGHUP:
// reload()
default:
time.AfterFunc(time.Duration(survivalTimeout), func() {
- logger.Warnf("app exit now by force...")
os.Exit(1)
})
diff --git a/dubbogo/simple/body/server/profiles/dev/server.yml b/dubbogo/simple/body/server/profiles/dev/server.yml
index bc3560e..42eaca3 100644
--- a/dubbogo/simple/body/server/profiles/dev/server.yml
+++ b/dubbogo/simple/body/server/profiles/dev/server.yml
@@ -22,13 +22,18 @@
dubbo:
registries:
zk:
- protocol: zookeeper
+ protocol: nacos
timeout: 3s
- address: 127.0.0.1:2181
+ address: 127.0.0.1:8848
+ username: nacos
+ password: nacos
protocols:
dubbo:
name: dubbo
port: 20000
+ tri:
+ name: tri
+ port: 20001
provider:
registry-ids: zk
services:
diff --git a/dubbohttpproxy/server/http/server.go b/dubbohttpproxy/server/http/server.go
index 436aaac..06b44a9 100644
--- a/dubbohttpproxy/server/http/server.go
+++ b/dubbohttpproxy/server/http/server.go
@@ -26,7 +26,7 @@
)
import (
- "github.com/apache/dubbo-go-pixiu/pixiu/pkg/common/constant"
+ "github.com/apache/dubbo-go-pixiu/pkg/common/constant"
)
func main() {
diff --git a/go.mod b/go.mod
index 6777488..754a6e6 100644
--- a/go.mod
+++ b/go.mod
@@ -18,5 +18,4 @@
google.golang.org/grpc v1.56.3
google.golang.org/protobuf v1.30.0
vimagination.zapto.org/memio v1.0.0 // indirect
-
)
diff --git a/grpc/server/app/server.go b/grpc/server/app/server.go
index 72be3d2..abe429e 100644
--- a/grpc/server/app/server.go
+++ b/grpc/server/app/server.go
@@ -23,7 +23,7 @@
)
import (
- "github.com/apache/dubbo-go-pixiu/pixiu/pkg/logger"
+ "github.com/apache/dubbo-go-pixiu/pkg/logger"
"google.golang.org/grpc"
)
diff --git a/http/grpc/server/app/server.go b/http/grpc/server/app/server.go
index ecc583f..824d34c 100644
--- a/http/grpc/server/app/server.go
+++ b/http/grpc/server/app/server.go
@@ -23,7 +23,7 @@
)
import (
- "github.com/apache/dubbo-go-pixiu/pixiu/pkg/logger"
+ "github.com/apache/dubbo-go-pixiu/pkg/logger"
"google.golang.org/grpc"
"google.golang.org/grpc/reflection"
diff --git a/http/simple/server/app/server.go b/http/simple/server/app/server.go
index 69c5272..b923684 100644
--- a/http/simple/server/app/server.go
+++ b/http/simple/server/app/server.go
@@ -27,7 +27,7 @@
)
import (
- "github.com/apache/dubbo-go-pixiu/pixiu/pkg/common/constant"
+ "github.com/apache/dubbo-go-pixiu/pkg/common/constant"
)
func main() {
diff --git a/http/simple/test/pixiu_test.go b/http/simple/test/pixiu_test.go
index 12112ed..ca54133 100644
--- a/http/simple/test/pixiu_test.go
+++ b/http/simple/test/pixiu_test.go
@@ -26,7 +26,7 @@
)
import (
- "github.com/apache/dubbo-go-pixiu/pixiu/pkg/common/constant"
+ "github.com/apache/dubbo-go-pixiu/pkg/common/constant"
"github.com/stretchr/testify/assert"
)
diff --git a/pixiu/pixiu.go b/pixiu/pixiu.go
index 0bb58ae..d07c7a0 100644
--- a/pixiu/pixiu.go
+++ b/pixiu/pixiu.go
@@ -28,8 +28,8 @@
)
import (
- "github.com/apache/dubbo-go-pixiu/pixiu/pkg/cmd"
- _ "github.com/apache/dubbo-go-pixiu/pixiu/pkg/pluginregistry"
+ "github.com/apache/dubbo-go-pixiu/pkg/cmd"
+ _ "github.com/apache/dubbo-go-pixiu/pkg/pluginregistry"
)
const (
diff --git a/shutdown/dubbo/server/app/server.go b/shutdown/dubbo/server/app/server.go
index fb91280..60b3ae6 100644
--- a/shutdown/dubbo/server/app/server.go
+++ b/shutdown/dubbo/server/app/server.go
@@ -24,7 +24,7 @@
)
import (
- "github.com/apache/dubbo-go-pixiu/pixiu/pkg/common/constant"
+ "github.com/apache/dubbo-go-pixiu/pkg/common/constant"
)
func main() {
diff --git a/shutdown/dubbo/test/pixiu_test.go b/shutdown/dubbo/test/pixiu_test.go
index 2f0c335..400fb8e 100644
--- a/shutdown/dubbo/test/pixiu_test.go
+++ b/shutdown/dubbo/test/pixiu_test.go
@@ -32,9 +32,9 @@
hessian "github.com/apache/dubbo-go-hessian2"
- "github.com/apache/dubbo-go-pixiu/pixiu/pkg/config"
- _ "github.com/apache/dubbo-go-pixiu/pixiu/pkg/pluginregistry"
- "github.com/apache/dubbo-go-pixiu/pixiu/pkg/server"
+ "github.com/apache/dubbo-go-pixiu/pkg/config"
+ _ "github.com/apache/dubbo-go-pixiu/pkg/pluginregistry"
+ "github.com/apache/dubbo-go-pixiu/pkg/server"
"github.com/stretchr/testify/assert"
)
diff --git a/shutdown/http/server/app/server.go b/shutdown/http/server/app/server.go
index 8e9d990..8015214 100644
--- a/shutdown/http/server/app/server.go
+++ b/shutdown/http/server/app/server.go
@@ -24,7 +24,7 @@
)
import (
- "github.com/apache/dubbo-go-pixiu/pixiu/pkg/common/constant"
+ "github.com/apache/dubbo-go-pixiu/pkg/common/constant"
)
func main() {
diff --git a/shutdown/http/test/pixiu_test.go b/shutdown/http/test/pixiu_test.go
index 64a4886..ccc240a 100644
--- a/shutdown/http/test/pixiu_test.go
+++ b/shutdown/http/test/pixiu_test.go
@@ -27,9 +27,9 @@
)
import (
- "github.com/apache/dubbo-go-pixiu/pixiu/pkg/config"
- _ "github.com/apache/dubbo-go-pixiu/pixiu/pkg/pluginregistry"
- "github.com/apache/dubbo-go-pixiu/pixiu/pkg/server"
+ "github.com/apache/dubbo-go-pixiu/pkg/config"
+ _ "github.com/apache/dubbo-go-pixiu/pkg/pluginregistry"
+ "github.com/apache/dubbo-go-pixiu/pkg/server"
"github.com/stretchr/testify/assert"
)
diff --git a/shutdown/http2/test/pixiu_test.go b/shutdown/http2/test/pixiu_test.go
index 01d6097..c75209e 100644
--- a/shutdown/http2/test/pixiu_test.go
+++ b/shutdown/http2/test/pixiu_test.go
@@ -26,9 +26,9 @@
)
import (
- "github.com/apache/dubbo-go-pixiu/pixiu/pkg/config"
- _ "github.com/apache/dubbo-go-pixiu/pixiu/pkg/pluginregistry"
- "github.com/apache/dubbo-go-pixiu/pixiu/pkg/server"
+ "github.com/apache/dubbo-go-pixiu/pkg/config"
+ _ "github.com/apache/dubbo-go-pixiu/pkg/pluginregistry"
+ "github.com/apache/dubbo-go-pixiu/pkg/server"
"github.com/stretchr/testify/assert"
diff --git a/shutdown/triple/server/app/server.go b/shutdown/triple/server/app/server.go
index 119459f..5632097 100644
--- a/shutdown/triple/server/app/server.go
+++ b/shutdown/triple/server/app/server.go
@@ -23,7 +23,7 @@
)
import (
- "github.com/apache/dubbo-go-pixiu/pixiu/pkg/common/constant"
+ "github.com/apache/dubbo-go-pixiu/pkg/common/constant"
)
func main() {
diff --git a/shutdown/triple/test/pixiu_test.go b/shutdown/triple/test/pixiu_test.go
index a4ae171..b4e66c4 100644
--- a/shutdown/triple/test/pixiu_test.go
+++ b/shutdown/triple/test/pixiu_test.go
@@ -32,9 +32,9 @@
hessian "github.com/apache/dubbo-go-hessian2"
- "github.com/apache/dubbo-go-pixiu/pixiu/pkg/config"
- _ "github.com/apache/dubbo-go-pixiu/pixiu/pkg/pluginregistry"
- "github.com/apache/dubbo-go-pixiu/pixiu/pkg/server"
+ "github.com/apache/dubbo-go-pixiu/pkg/config"
+ _ "github.com/apache/dubbo-go-pixiu/pkg/pluginregistry"
+ "github.com/apache/dubbo-go-pixiu/pkg/server"
tpconst "github.com/dubbogo/triple/pkg/common/constant" //nolint
diff --git a/xds/local-control-panel/server/app/resource_pixiu.go b/xds/local-control-panel/server/app/resource_pixiu.go
index 0520ba1..6bafedb 100644
--- a/xds/local-control-panel/server/app/resource_pixiu.go
+++ b/xds/local-control-panel/server/app/resource_pixiu.go
@@ -18,7 +18,7 @@
package main
import (
- "github.com/apache/dubbo-go-pixiu/pixiu/pkg/common/constant"
+ "github.com/apache/dubbo-go-pixiu/pkg/common/constant"
"github.com/dubbo-go-pixiu/pixiu-api/pkg/xds"
pixiupb "github.com/dubbo-go-pixiu/pixiu-api/pkg/xds/model"
