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 4b43ce89 [chore] Organize pre-release catalog structure (#365)
4b43ce89 is described below
commit 4b43ce8966ab9b4586cabf8b2d92e8d02bb7de3a
Author: mfordjody <[email protected]>
AuthorDate: Sun Sep 22 12:59:10 2024 +0800
[chore] Organize pre-release catalog structure (#365)
typo
ci check
ci check
---
README.md | 14 ++++-----
app/dubboctl/internal/dubbo/templates_embedded.go | 4 +--
deploy/example/{dubbo-admin.yaml => admin.yaml} | 0
docs/{generate => generated}/policies.md | 0
docs/{ => static}/images/homepage/arch1.png | Bin
docs/{ => static}/images/homepage/arch2.png | Bin
.../images/homepage/kubernetes-mode.png | Bin
.../images/homepage/multiple-cluster.png | Bin
docs/{ => static}/images/homepage/ui-demo.png | Bin
.../images/homepage/universal-mode.png | Bin
docs/{ => static}/images/ide_configuration.png | Bin
docs/{ => static}/images/index.png | Bin
docs/{ => static}/images/logo.png | Bin
docs/{ => static}/images/profile-eclipse.jpg | Bin
docs/{ => static}/images/profile-idea.jpg | Bin
.../templates/main.go => generated/generated.go | 2 +-
{generate => generated}/zz_filesystem_generated.go | 2 +-
release/README.md | 1 +
release/{downloadDubbo.sh => download/dubbo.sh} | 0
.../{downloadDubboCtl.sh => download/dubboctl.sh} | 0
template/go/README.md | 1 +
{templates => template}/go/common/.gitignore | 0
{templates => template}/go/common/api/api.pb.go | 0
{templates => template}/go/common/api/api.proto | 0
.../go/common/api/api_triple.pb.go | 0
.../go/common/cmd/app.go | 22 +++++--------
.../go/common/conf/dubbogo.yaml | 20 +++++++-----
{templates => template}/go/common/go.mod | 15 +++++++++
{templates => template}/go/common/go.sum | 0
.../go/common/pkg/service/service.go | 29 +++++++++--------
template/java/README.md | 1 +
{templates => template}/java/common/.gitignore | 0
{templates => template}/java/common/pom.xml | 16 ++++++++++
.../java/com/example/demo/DemoApplication.java | 29 +++++++----------
.../example/demo/demos/web/BasicController.java | 13 ++++----
.../demo/demos/web/PathVariableController.java | 13 ++++----
.../main/java/com/example/demo/demos/web/User.java | 13 ++++----
.../com/example/demo/dubbo/api/DemoService.java | 21 ++-----------
.../com/example/demo/dubbo/consumer/Consumer.java | 35 ++++++++++-----------
.../demo/dubbo/service/DemoServiceImpl.java | 28 ++++++-----------
.../java/common/src/main/resources/application.yml | 16 +++++-----
.../common/src/main/resources/log4j.properties | 0
.../common/src/main/resources/static/index.html | 23 ++++++++++++++
.../com/example/demo/DemoApplicationTests.java | 0
.../dp/ingress.yaml => template/manifest.yaml | 14 ++++-----
templates/go/common/cmd/app.go | 16 ----------
templates/go/common/conf/dubbogo.yaml | 13 --------
templates/go/common/pkg/service/service.go | 25 ---------------
.../java/com/example/demo/DemoApplication.java | 15 ---------
.../com/example/demo/dubbo/api/DemoService.java | 7 -----
.../com/example/demo/dubbo/consumer/Consumer.java | 21 -------------
.../demo/dubbo/service/DemoServiceImpl.java | 14 ---------
.../java/common/src/main/resources/application.yml | 9 ------
.../common/src/main/resources/static/index.html | 6 ----
templates/manifest.yaml | 6 ----
.../dubbo.apache.org_authenticationpolicies.yaml | 0
.../dubbo.apache.org_authorizationpolicies.yaml | 0
test/{control-plane => cp}/cp.yaml | 0
.../crds/dubbo.io_conditionroutes.yaml | 0
.../crds/dubbo.io_dataplaneinsights.yaml | 0
.../crds/dubbo.io_dataplanes.yaml | 0
.../crds/dubbo.io_datasources.yaml | 0
.../crds/dubbo.io_dynamicconfigs.yaml | 0
.../crds/dubbo.io_mappings.yaml | 0
.../crds/dubbo.io_meshes.yaml | 0
.../crds/dubbo.io_meshinsights.yaml | 0
.../crds/dubbo.io_metadata.yaml | 0
.../crds/dubbo.io_secrets.yaml | 0
.../crds/dubbo.io_servicenamemappings.yaml | 0
.../crds/dubbo.io_tagroutes.yaml | 0
.../crds/dubbo.io_zoneegresses.yaml | 0
.../crds/dubbo.io_zoneegressinsights.yaml | 0
.../crds/dubbo.io_zoneingresses.yaml | 0
.../crds/dubbo.io_zoneingressinsights.yaml | 0
.../crds/dubbo.io_zoneinsights.yaml | 0
.../{control-plane => cp}/crds/dubbo.io_zones.yaml | 0
test/{proxy => dp}/dp-bootstrap.yaml | 0
test/{proxy => dp}/dp.Dockerfile | 0
test/{proxy => dp}/dp/ingress.yaml | 0
.../dubbo.apache.org_conditionroutes.yaml | 0
.../dubbo.apache.org_dynamicconfigs.yaml | 0
.../dubbo.apache.org_servicenamemappings.yaml | 0
.../dubbo.apache.org_tagroutes.yaml | 0
83 files changed, 183 insertions(+), 281 deletions(-)
diff --git a/README.md b/README.md
index 1bf13bd3..e9a19287 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ The Dubbo Kubernetes Integration
**The universal Control Plane and Console for managing microservices on any
environment - VM and Kubernetes.**
-
+
## Quick Start (under development)
> NOTICE: As the project has not been officially released yet, the following
> commands may not run properly. The best way for now is to refer to the
> [Developer's Guide](./DEVELOPER.md) to learn how to download the source code
> and build it locally!
@@ -20,7 +20,7 @@ The Dubbo Kubernetes Integration
1. Download `dubbo-control-plane` binary package.
```shell
- curl -L
https://raw.githubusercontent.com/apache/dubbo-kubernetes/master/release/downloadDubbo.sh
| sh -
+ curl -L
https://raw.githubusercontent.com/apache/dubbo-kubernetes/master/release/download/dubbo.sh
| sh -
cd dubbo-$version
export PATH=$PWD/bin:$PATH
@@ -83,11 +83,11 @@ The Dubbo Kubernetes Integration
visit, 127.0.0.1:5681/admin
- 
+ 
## Architecture
-
+
The microservcice architecture built with Dubbo Control Plane consists of two
main components:
@@ -102,21 +102,21 @@ Dubbo Control Plane supports two deployment modes:
**`kubernetes`** and **`unive
### Kubernetes
In kubernetes mode, the control plane will interact directly with the
Kubernetes API-SERVER, watching the kubernetes resources and transform them as
xDS resources for service discovery and traffic management configurations.
-
+
We all know the `service` definitions of Kubernetes and Dubo are different,
`Kubernetes Service` is more like an application concept run on a selected
group of pods while `Dubbo Service` can mean a specific RPC service inside the
application process. So how does dubbo control plane manages to bridge the
`interface-application` gap, check [here]() for more details.
### Universal
In Universal mode, Dubbo still uses Nacos or Zookeeper as registries for
service discovery, control plane then interact with registry directly to work
as the console UI, as the entry point for viewing and managing the cluster.
-
+
### Multiple clusters
Dubbo Control Plane supports running your services in multiple zones. It is
even possible to run with a mix of Kubernetes and Universal zones. Your
microservice environment can include multiple isolated services, and workloads
running in different regions, on different clouds, or in different datacenters.
A zone can be a Kubernetes cluster, a VPC, or any other deployment you need to
include in the same distributed microservice environment. The only condition is
that all the data planes r [...]
Dubbo Control Plane supports a **`global`** deployment mode that can connect
different **`zone`** region clusters. The picture below shows how it works.
-
+
## Roadmap
diff --git a/app/dubboctl/internal/dubbo/templates_embedded.go
b/app/dubboctl/internal/dubbo/templates_embedded.go
index e9200395..3e18a5f9 100644
--- a/app/dubboctl/internal/dubbo/templates_embedded.go
+++ b/app/dubboctl/internal/dubbo/templates_embedded.go
@@ -24,12 +24,12 @@ import (
import (
"github.com/apache/dubbo-kubernetes/app/dubboctl/internal/filesystem"
- "github.com/apache/dubbo-kubernetes/generate"
+ "github.com/apache/dubbo-kubernetes/generated"
)
//go:generate go run ../../../../generate/templates/main.go
func newEmbeddedTemplatesFS() filesystem.Filesystem {
- archive, err := zip.NewReader(bytes.NewReader(generate.TemplatesZip),
int64(len(generate.TemplatesZip)))
+ archive, err := zip.NewReader(bytes.NewReader(generated.TemplatesZip),
int64(len(generated.TemplatesZip)))
if err != nil {
panic(err)
}
diff --git a/deploy/example/dubbo-admin.yaml b/deploy/example/admin.yaml
similarity index 100%
rename from deploy/example/dubbo-admin.yaml
rename to deploy/example/admin.yaml
diff --git a/docs/generate/policies.md b/docs/generated/policies.md
similarity index 100%
rename from docs/generate/policies.md
rename to docs/generated/policies.md
diff --git a/docs/images/homepage/arch1.png
b/docs/static/images/homepage/arch1.png
similarity index 100%
rename from docs/images/homepage/arch1.png
rename to docs/static/images/homepage/arch1.png
diff --git a/docs/images/homepage/arch2.png
b/docs/static/images/homepage/arch2.png
similarity index 100%
rename from docs/images/homepage/arch2.png
rename to docs/static/images/homepage/arch2.png
diff --git a/docs/images/homepage/kubernetes-mode.png
b/docs/static/images/homepage/kubernetes-mode.png
similarity index 100%
rename from docs/images/homepage/kubernetes-mode.png
rename to docs/static/images/homepage/kubernetes-mode.png
diff --git a/docs/images/homepage/multiple-cluster.png
b/docs/static/images/homepage/multiple-cluster.png
similarity index 100%
rename from docs/images/homepage/multiple-cluster.png
rename to docs/static/images/homepage/multiple-cluster.png
diff --git a/docs/images/homepage/ui-demo.png
b/docs/static/images/homepage/ui-demo.png
similarity index 100%
rename from docs/images/homepage/ui-demo.png
rename to docs/static/images/homepage/ui-demo.png
diff --git a/docs/images/homepage/universal-mode.png
b/docs/static/images/homepage/universal-mode.png
similarity index 100%
rename from docs/images/homepage/universal-mode.png
rename to docs/static/images/homepage/universal-mode.png
diff --git a/docs/images/ide_configuration.png
b/docs/static/images/ide_configuration.png
similarity index 100%
rename from docs/images/ide_configuration.png
rename to docs/static/images/ide_configuration.png
diff --git a/docs/images/index.png b/docs/static/images/index.png
similarity index 100%
rename from docs/images/index.png
rename to docs/static/images/index.png
diff --git a/docs/images/logo.png b/docs/static/images/logo.png
similarity index 100%
rename from docs/images/logo.png
rename to docs/static/images/logo.png
diff --git a/docs/images/profile-eclipse.jpg
b/docs/static/images/profile-eclipse.jpg
similarity index 100%
rename from docs/images/profile-eclipse.jpg
rename to docs/static/images/profile-eclipse.jpg
diff --git a/docs/images/profile-idea.jpg b/docs/static/images/profile-idea.jpg
similarity index 100%
rename from docs/images/profile-idea.jpg
rename to docs/static/images/profile-idea.jpg
diff --git a/generate/templates/main.go b/generated/generated.go
similarity index 99%
rename from generate/templates/main.go
rename to generated/generated.go
index f37db43b..1e33d08a 100644
--- a/generate/templates/main.go
+++ b/generated/generated.go
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package main
+package generated
import (
"archive/zip"
diff --git a/generate/zz_filesystem_generated.go
b/generated/zz_filesystem_generated.go
similarity index 99%
rename from generate/zz_filesystem_generated.go
rename to generated/zz_filesystem_generated.go
index 2cfbe611..e22caa5e 100644
--- a/generate/zz_filesystem_generated.go
+++ b/generated/zz_filesystem_generated.go
@@ -15,7 +15,7 @@
* limitations under the License.
*/
// Code generated by go generate; DO NOT EDIT.
-package generate
+package generated
var TemplatesZip = []byte{
0x50, 0x4b, 0x03, 0x04, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x03, 0x00, 0x00, 0x00, 0x67, 0x6f,
diff --git a/release/README.md b/release/README.md
new file mode 100644
index 00000000..3be8ffab
--- /dev/null
+++ b/release/README.md
@@ -0,0 +1 @@
+# Download
\ No newline at end of file
diff --git a/release/downloadDubbo.sh b/release/download/dubbo.sh
similarity index 100%
rename from release/downloadDubbo.sh
rename to release/download/dubbo.sh
diff --git a/release/downloadDubboCtl.sh b/release/download/dubboctl.sh
similarity index 100%
rename from release/downloadDubboCtl.sh
rename to release/download/dubboctl.sh
diff --git a/template/go/README.md b/template/go/README.md
new file mode 100644
index 00000000..59448b21
--- /dev/null
+++ b/template/go/README.md
@@ -0,0 +1 @@
+# Go
\ No newline at end of file
diff --git a/templates/go/common/.gitignore b/template/go/common/.gitignore
similarity index 100%
rename from templates/go/common/.gitignore
rename to template/go/common/.gitignore
diff --git a/templates/go/common/api/api.pb.go
b/template/go/common/api/api.pb.go
similarity index 100%
rename from templates/go/common/api/api.pb.go
rename to template/go/common/api/api.pb.go
diff --git a/templates/go/common/api/api.proto
b/template/go/common/api/api.proto
similarity index 100%
rename from templates/go/common/api/api.proto
rename to template/go/common/api/api.proto
diff --git a/templates/go/common/api/api_triple.pb.go
b/template/go/common/api/api_triple.pb.go
similarity index 100%
rename from templates/go/common/api/api_triple.pb.go
rename to template/go/common/api/api_triple.pb.go
diff --git a/app/dubboctl/internal/dubbo/templates_embedded.go
b/template/go/common/cmd/app.go
similarity index 62%
copy from app/dubboctl/internal/dubbo/templates_embedded.go
copy to template/go/common/cmd/app.go
index e9200395..71876341 100644
--- a/app/dubboctl/internal/dubbo/templates_embedded.go
+++ b/template/go/common/cmd/app.go
@@ -15,25 +15,19 @@
* limitations under the License.
*/
-package dubbo
+package main
import (
- "archive/zip"
- "bytes"
-)
+ _ "dubbo-go-app/pkg/service"
-import (
- "github.com/apache/dubbo-kubernetes/app/dubboctl/internal/filesystem"
- "github.com/apache/dubbo-kubernetes/generate"
+ "dubbo.apache.org/dubbo-go/v3/config"
+ _ "dubbo.apache.org/dubbo-go/v3/imports"
)
-//go:generate go run ../../../../generate/templates/main.go
-func newEmbeddedTemplatesFS() filesystem.Filesystem {
- archive, err := zip.NewReader(bytes.NewReader(generate.TemplatesZip),
int64(len(generate.TemplatesZip)))
- if err != nil {
+// export DUBBO_GO_CONFIG_PATH=$PATH_TO_APP/conf/dubbogo.yaml
+func main() {
+ if err := config.Load(); err != nil {
panic(err)
}
- return filesystem.NewZipFS(archive)
+ select {}
}
-
-var EmbeddedTemplatesFS = newEmbeddedTemplatesFS()
diff --git a/test/proxy/dp/ingress.yaml b/template/go/common/conf/dubbogo.yaml
similarity index 77%
copy from test/proxy/dp/ingress.yaml
copy to template/go/common/conf/dubbogo.yaml
index 6080785c..2463de66 100644
--- a/test/proxy/dp/ingress.yaml
+++ b/template/go/common/conf/dubbogo.yaml
@@ -13,10 +13,16 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-type: ZoneIngress
-name: zoneingress-1
-networking:
- address: 192.168.0.1
- port: 10001
- advertisedAddress: 10.0.0.1
- advertisedPort: 10000
\ No newline at end of file
+dubbo:
+ registries:
+ nacos:
+ protocol: nacos
+ address: nacos:8848
+ protocols:
+ triple:
+ name: tri
+ port: 20000
+ provider:
+ services:
+ GreeterServerImpl:
+ interface: "" # read from stub
diff --git a/templates/go/common/go.mod b/template/go/common/go.mod
similarity index 88%
rename from templates/go/common/go.mod
rename to template/go/common/go.mod
index 226e10ac..806736fe 100644
--- a/templates/go/common/go.mod
+++ b/template/go/common/go.mod
@@ -1,3 +1,18 @@
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to You under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
module dubbo-go-app
go 1.20
diff --git a/templates/go/common/go.sum b/template/go/common/go.sum
similarity index 100%
rename from templates/go/common/go.sum
rename to template/go/common/go.sum
diff --git a/app/dubboctl/internal/dubbo/templates_embedded.go
b/template/go/common/pkg/service/service.go
similarity index 62%
copy from app/dubboctl/internal/dubbo/templates_embedded.go
copy to template/go/common/pkg/service/service.go
index e9200395..4a89b78e 100644
--- a/app/dubboctl/internal/dubbo/templates_embedded.go
+++ b/template/go/common/pkg/service/service.go
@@ -15,25 +15,28 @@
* limitations under the License.
*/
-package dubbo
+package service
import (
- "archive/zip"
- "bytes"
+ "context"
)
import (
- "github.com/apache/dubbo-kubernetes/app/dubboctl/internal/filesystem"
- "github.com/apache/dubbo-kubernetes/generate"
+ "dubbo-go-app/api"
+
+ "dubbo.apache.org/dubbo-go/v3/common/logger"
+ "dubbo.apache.org/dubbo-go/v3/config"
)
-//go:generate go run ../../../../generate/templates/main.go
-func newEmbeddedTemplatesFS() filesystem.Filesystem {
- archive, err := zip.NewReader(bytes.NewReader(generate.TemplatesZip),
int64(len(generate.TemplatesZip)))
- if err != nil {
- panic(err)
- }
- return filesystem.NewZipFS(archive)
+type GreeterServerImpl struct {
+ api.UnimplementedGreeterServer
+}
+
+func (s *GreeterServerImpl) SayHello(ctx context.Context, in
*api.HelloRequest) (*api.User, error) {
+ logger.Infof("Dubbo-go GreeterProvider get user name = %s\n", in.Name)
+ return &api.User{Name: "Hello " + in.Name, Id: "12345", Age: 21}, nil
}
-var EmbeddedTemplatesFS = newEmbeddedTemplatesFS()
+func init() {
+ config.SetProviderService(&GreeterServerImpl{})
+}
diff --git a/template/java/README.md b/template/java/README.md
new file mode 100644
index 00000000..6741a726
--- /dev/null
+++ b/template/java/README.md
@@ -0,0 +1 @@
+# JAVA
\ No newline at end of file
diff --git a/templates/java/common/.gitignore b/template/java/common/.gitignore
similarity index 100%
rename from templates/java/common/.gitignore
rename to template/java/common/.gitignore
diff --git a/templates/java/common/pom.xml b/template/java/common/pom.xml
similarity index 84%
rename from templates/java/common/pom.xml
rename to template/java/common/pom.xml
index a416ba10..47a555be 100644
--- a/templates/java/common/pom.xml
+++ b/template/java/common/pom.xml
@@ -1,4 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
diff --git a/app/dubboctl/internal/dubbo/templates_embedded.go
b/template/java/common/src/main/java/com/example/demo/DemoApplication.java
similarity index 60%
copy from app/dubboctl/internal/dubbo/templates_embedded.go
copy to template/java/common/src/main/java/com/example/demo/DemoApplication.java
index e9200395..fb3f112f 100644
--- a/app/dubboctl/internal/dubbo/templates_embedded.go
+++ b/template/java/common/src/main/java/com/example/demo/DemoApplication.java
@@ -15,25 +15,18 @@
* limitations under the License.
*/
-package dubbo
+package com.example.demo;
-import (
- "archive/zip"
- "bytes"
-)
+import org.apache.dubbo.config.spring.context.annotation.EnableDubbo;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
-import (
- "github.com/apache/dubbo-kubernetes/app/dubboctl/internal/filesystem"
- "github.com/apache/dubbo-kubernetes/generate"
-)
+@SpringBootApplication
+@EnableDubbo
+public class DemoApplication {
-//go:generate go run ../../../../generate/templates/main.go
-func newEmbeddedTemplatesFS() filesystem.Filesystem {
- archive, err := zip.NewReader(bytes.NewReader(generate.TemplatesZip),
int64(len(generate.TemplatesZip)))
- if err != nil {
- panic(err)
- }
- return filesystem.NewZipFS(archive)
-}
+ public static void main(String[] args) {
+ SpringApplication.run(DemoApplication.class, args);
+ }
-var EmbeddedTemplatesFS = newEmbeddedTemplatesFS()
+}
diff --git
a/templates/java/common/src/main/java/com/example/demo/demos/web/BasicController.java
b/template/java/common/src/main/java/com/example/demo/demos/web/BasicController.java
similarity index 80%
rename from
templates/java/common/src/main/java/com/example/demo/demos/web/BasicController.java
rename to
template/java/common/src/main/java/com/example/demo/demos/web/BasicController.java
index e0d9d6d0..1ceabb6e 100644
---
a/templates/java/common/src/main/java/com/example/demo/demos/web/BasicController.java
+++
b/template/java/common/src/main/java/com/example/demo/demos/web/BasicController.java
@@ -1,11 +1,12 @@
/*
- * Copyright 2013-2018 the original author or authors.
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git
a/templates/java/common/src/main/java/com/example/demo/demos/web/PathVariableController.java
b/template/java/common/src/main/java/com/example/demo/demos/web/PathVariableController.java
similarity index 74%
rename from
templates/java/common/src/main/java/com/example/demo/demos/web/PathVariableController.java
rename to
template/java/common/src/main/java/com/example/demo/demos/web/PathVariableController.java
index adad5af3..8af01e15 100644
---
a/templates/java/common/src/main/java/com/example/demo/demos/web/PathVariableController.java
+++
b/template/java/common/src/main/java/com/example/demo/demos/web/PathVariableController.java
@@ -1,11 +1,12 @@
/*
- * Copyright 2013-2018 the original author or authors.
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git
a/templates/java/common/src/main/java/com/example/demo/demos/web/User.java
b/template/java/common/src/main/java/com/example/demo/demos/web/User.java
similarity index 62%
rename from
templates/java/common/src/main/java/com/example/demo/demos/web/User.java
rename to
template/java/common/src/main/java/com/example/demo/demos/web/User.java
index f1808461..f79a03b9 100644
--- a/templates/java/common/src/main/java/com/example/demo/demos/web/User.java
+++ b/template/java/common/src/main/java/com/example/demo/demos/web/User.java
@@ -1,11 +1,12 @@
/*
- * Copyright 2013-2018 the original author or authors.
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/app/dubboctl/internal/dubbo/templates_embedded.go
b/template/java/common/src/main/java/com/example/demo/dubbo/api/DemoService.java
similarity index 60%
copy from app/dubboctl/internal/dubbo/templates_embedded.go
copy to
template/java/common/src/main/java/com/example/demo/dubbo/api/DemoService.java
index e9200395..fbcce57a 100644
--- a/app/dubboctl/internal/dubbo/templates_embedded.go
+++
b/template/java/common/src/main/java/com/example/demo/dubbo/api/DemoService.java
@@ -15,25 +15,10 @@
* limitations under the License.
*/
-package dubbo
+package com.example.demo.dubbo.api;
-import (
- "archive/zip"
- "bytes"
-)
+public interface DemoService {
-import (
- "github.com/apache/dubbo-kubernetes/app/dubboctl/internal/filesystem"
- "github.com/apache/dubbo-kubernetes/generate"
-)
+ String sayHello(String name);
-//go:generate go run ../../../../generate/templates/main.go
-func newEmbeddedTemplatesFS() filesystem.Filesystem {
- archive, err := zip.NewReader(bytes.NewReader(generate.TemplatesZip),
int64(len(generate.TemplatesZip)))
- if err != nil {
- panic(err)
- }
- return filesystem.NewZipFS(archive)
}
-
-var EmbeddedTemplatesFS = newEmbeddedTemplatesFS()
diff --git a/app/dubboctl/internal/dubbo/templates_embedded.go
b/template/java/common/src/main/java/com/example/demo/dubbo/consumer/Consumer.java
similarity index 58%
copy from app/dubboctl/internal/dubbo/templates_embedded.go
copy to
template/java/common/src/main/java/com/example/demo/dubbo/consumer/Consumer.java
index e9200395..b45c5a67 100644
--- a/app/dubboctl/internal/dubbo/templates_embedded.go
+++
b/template/java/common/src/main/java/com/example/demo/dubbo/consumer/Consumer.java
@@ -15,25 +15,24 @@
* limitations under the License.
*/
-package dubbo
+package com.example.demo.dubbo.consumer;
-import (
- "archive/zip"
- "bytes"
-)
+import com.example.demo.dubbo.api.DemoService;
-import (
- "github.com/apache/dubbo-kubernetes/app/dubboctl/internal/filesystem"
- "github.com/apache/dubbo-kubernetes/generate"
-)
+import org.apache.dubbo.config.annotation.DubboReference;
-//go:generate go run ../../../../generate/templates/main.go
-func newEmbeddedTemplatesFS() filesystem.Filesystem {
- archive, err := zip.NewReader(bytes.NewReader(generate.TemplatesZip),
int64(len(generate.TemplatesZip)))
- if err != nil {
- panic(err)
- }
- return filesystem.NewZipFS(archive)
-}
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.stereotype.Component;
+
+@Component
+public class Consumer implements CommandLineRunner {
+ @DubboReference
+ private DemoService demoService;
-var EmbeddedTemplatesFS = newEmbeddedTemplatesFS()
+ @Override
+ public void run(String... args) throws Exception {
+
+ String result = demoService.sayHello("world");
+ System.out.println("Receive result ======> " + result);
+ }
+}
diff --git a/app/dubboctl/internal/dubbo/templates_embedded.go
b/template/java/common/src/main/java/com/example/demo/dubbo/service/DemoServiceImpl.java
similarity index 60%
copy from app/dubboctl/internal/dubbo/templates_embedded.go
copy to
template/java/common/src/main/java/com/example/demo/dubbo/service/DemoServiceImpl.java
index e9200395..8f7b5fb6 100644
--- a/app/dubboctl/internal/dubbo/templates_embedded.go
+++
b/template/java/common/src/main/java/com/example/demo/dubbo/service/DemoServiceImpl.java
@@ -15,25 +15,17 @@
* limitations under the License.
*/
-package dubbo
+package com.example.demo.dubbo.service;
-import (
- "archive/zip"
- "bytes"
-)
+import com.example.demo.dubbo.api.DemoService;
-import (
- "github.com/apache/dubbo-kubernetes/app/dubboctl/internal/filesystem"
- "github.com/apache/dubbo-kubernetes/generate"
-)
+import org.apache.dubbo.config.annotation.DubboService;
-//go:generate go run ../../../../generate/templates/main.go
-func newEmbeddedTemplatesFS() filesystem.Filesystem {
- archive, err := zip.NewReader(bytes.NewReader(generate.TemplatesZip),
int64(len(generate.TemplatesZip)))
- if err != nil {
- panic(err)
- }
- return filesystem.NewZipFS(archive)
-}
+@DubboService
+public class DemoServiceImpl implements DemoService {
-var EmbeddedTemplatesFS = newEmbeddedTemplatesFS()
+ @Override
+ public String sayHello(String name) {
+ return "Hello " + name;
+ }
+}
\ No newline at end of file
diff --git a/test/proxy/dp/ingress.yaml
b/template/java/common/src/main/resources/application.yml
similarity index 81%
copy from test/proxy/dp/ingress.yaml
copy to template/java/common/src/main/resources/application.yml
index 6080785c..e1e526c3 100644
--- a/test/proxy/dp/ingress.yaml
+++ b/template/java/common/src/main/resources/application.yml
@@ -13,10 +13,12 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-type: ZoneIngress
-name: zoneingress-1
-networking:
- address: 192.168.0.1
- port: 10001
- advertisedAddress: 10.0.0.1
- advertisedPort: 10000
\ No newline at end of file
+dubbo:
+ application:
+ logger: slf4j
+ name: DemoApplication
+ registry:
+ address: zookeeper://${zookeeper.address:127.0.0.1}:2181
+ protocol:
+ name: tri
+ port: 50051
diff --git a/templates/java/common/src/main/resources/log4j.properties
b/template/java/common/src/main/resources/log4j.properties
similarity index 100%
rename from templates/java/common/src/main/resources/log4j.properties
rename to template/java/common/src/main/resources/log4j.properties
diff --git a/template/java/common/src/main/resources/static/index.html
b/template/java/common/src/main/resources/static/index.html
new file mode 100644
index 00000000..586eb8b9
--- /dev/null
+++ b/template/java/common/src/main/resources/static/index.html
@@ -0,0 +1,23 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<html>
+ <body>
+ <h1>hello word!!!</h1>
+ <p>this is a html page</p>
+ </body>
+</html>
\ No newline at end of file
diff --git
a/templates/java/common/src/test/java/com/example/demo/DemoApplicationTests.java
b/template/java/common/src/test/java/com/example/demo/DemoApplicationTests.java
similarity index 100%
rename from
templates/java/common/src/test/java/com/example/demo/DemoApplicationTests.java
rename to
template/java/common/src/test/java/com/example/demo/DemoApplicationTests.java
diff --git a/test/proxy/dp/ingress.yaml b/template/manifest.yaml
similarity index 80%
copy from test/proxy/dp/ingress.yaml
copy to template/manifest.yaml
index 6080785c..b14c34c3 100644
--- a/test/proxy/dp/ingress.yaml
+++ b/template/manifest.yaml
@@ -13,10 +13,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-type: ZoneIngress
-name: zoneingress-1
-networking:
- address: 192.168.0.1
- port: 10001
- advertisedAddress: 10.0.0.1
- advertisedPort: 10000
\ No newline at end of file
+# The version for manifest.yaml schema
+schema_version: 0.0.1
+
+# The name used for this language pack repository when referenced
+# in the UX, and its version
+name: default
+version: 0.0.1
diff --git a/templates/go/common/cmd/app.go b/templates/go/common/cmd/app.go
deleted file mode 100644
index 5294e24c..00000000
--- a/templates/go/common/cmd/app.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package main
-
-import (
- _ "dubbo-go-app/pkg/service"
-
- "dubbo.apache.org/dubbo-go/v3/config"
- _ "dubbo.apache.org/dubbo-go/v3/imports"
-)
-
-// export DUBBO_GO_CONFIG_PATH=$PATH_TO_APP/conf/dubbogo.yaml
-func main() {
- if err := config.Load(); err != nil {
- panic(err)
- }
- select {}
-}
diff --git a/templates/go/common/conf/dubbogo.yaml
b/templates/go/common/conf/dubbogo.yaml
deleted file mode 100644
index 0bca0bd4..00000000
--- a/templates/go/common/conf/dubbogo.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-dubbo:
- registries:
- nacos:
- protocol: nacos
- address: nacos:8848
- protocols:
- triple:
- name: tri
- port: 20000
- provider:
- services:
- GreeterServerImpl:
- interface: "" # read from stub
diff --git a/templates/go/common/pkg/service/service.go
b/templates/go/common/pkg/service/service.go
deleted file mode 100644
index f00ef58f..00000000
--- a/templates/go/common/pkg/service/service.go
+++ /dev/null
@@ -1,25 +0,0 @@
-package service
-
-import (
- "context"
-)
-
-import (
- "dubbo-go-app/api"
-
- "dubbo.apache.org/dubbo-go/v3/common/logger"
- "dubbo.apache.org/dubbo-go/v3/config"
-)
-
-type GreeterServerImpl struct {
- api.UnimplementedGreeterServer
-}
-
-func (s *GreeterServerImpl) SayHello(ctx context.Context, in
*api.HelloRequest) (*api.User, error) {
- logger.Infof("Dubbo-go GreeterProvider get user name = %s\n", in.Name)
- return &api.User{Name: "Hello " + in.Name, Id: "12345", Age: 21}, nil
-}
-
-func init() {
- config.SetProviderService(&GreeterServerImpl{})
-}
diff --git
a/templates/java/common/src/main/java/com/example/demo/DemoApplication.java
b/templates/java/common/src/main/java/com/example/demo/DemoApplication.java
deleted file mode 100644
index e6c25c18..00000000
--- a/templates/java/common/src/main/java/com/example/demo/DemoApplication.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.example.demo;
-
-import org.apache.dubbo.config.spring.context.annotation.EnableDubbo;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-@SpringBootApplication
-@EnableDubbo
-public class DemoApplication {
-
- public static void main(String[] args) {
- SpringApplication.run(DemoApplication.class, args);
- }
-
-}
diff --git
a/templates/java/common/src/main/java/com/example/demo/dubbo/api/DemoService.java
b/templates/java/common/src/main/java/com/example/demo/dubbo/api/DemoService.java
deleted file mode 100644
index 906a51bd..00000000
---
a/templates/java/common/src/main/java/com/example/demo/dubbo/api/DemoService.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.example.demo.dubbo.api;
-
-public interface DemoService {
-
- String sayHello(String name);
-
-}
diff --git
a/templates/java/common/src/main/java/com/example/demo/dubbo/consumer/Consumer.java
b/templates/java/common/src/main/java/com/example/demo/dubbo/consumer/Consumer.java
deleted file mode 100644
index a2373a9e..00000000
---
a/templates/java/common/src/main/java/com/example/demo/dubbo/consumer/Consumer.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.example.demo.dubbo.consumer;
-
-import com.example.demo.dubbo.api.DemoService;
-
-import org.apache.dubbo.config.annotation.DubboReference;
-
-import org.springframework.boot.CommandLineRunner;
-import org.springframework.stereotype.Component;
-
-@Component
-public class Consumer implements CommandLineRunner {
- @DubboReference
- private DemoService demoService;
-
- @Override
- public void run(String... args) throws Exception {
-
- String result = demoService.sayHello("world");
- System.out.println("Receive result ======> " + result);
- }
-}
diff --git
a/templates/java/common/src/main/java/com/example/demo/dubbo/service/DemoServiceImpl.java
b/templates/java/common/src/main/java/com/example/demo/dubbo/service/DemoServiceImpl.java
deleted file mode 100644
index 65ef3c7d..00000000
---
a/templates/java/common/src/main/java/com/example/demo/dubbo/service/DemoServiceImpl.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.example.demo.dubbo.service;
-
-import com.example.demo.dubbo.api.DemoService;
-
-import org.apache.dubbo.config.annotation.DubboService;
-
-@DubboService
-public class DemoServiceImpl implements DemoService {
-
- @Override
- public String sayHello(String name) {
- return "Hello " + name;
- }
-}
\ No newline at end of file
diff --git a/templates/java/common/src/main/resources/application.yml
b/templates/java/common/src/main/resources/application.yml
deleted file mode 100644
index 7e85f4bc..00000000
--- a/templates/java/common/src/main/resources/application.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-dubbo:
- application:
- logger: slf4j
- name: DemoApplication
- registry:
- address: zookeeper://${zookeeper.address:127.0.0.1}:2181
- protocol:
- name: tri
- port: 50051
diff --git a/templates/java/common/src/main/resources/static/index.html
b/templates/java/common/src/main/resources/static/index.html
deleted file mode 100644
index e2d94a21..00000000
--- a/templates/java/common/src/main/resources/static/index.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<html>
- <body>
- <h1>hello word!!!</h1>
- <p>this is a html page</p>
- </body>
-</html>
\ No newline at end of file
diff --git a/templates/manifest.yaml b/templates/manifest.yaml
deleted file mode 100644
index 053967bc..00000000
--- a/templates/manifest.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-schema_version: 0.0.1 # The version for manifest.yaml schema
-
-# The name used for this language pack repository when referenced
-# in the UX, and its version
-name: default
-version: 0.0.1
diff --git a/test/crds/auth/dubbo.apache.org_authenticationpolicies.yaml
b/test/auth/dubbo.apache.org_authenticationpolicies.yaml
similarity index 100%
rename from test/crds/auth/dubbo.apache.org_authenticationpolicies.yaml
rename to test/auth/dubbo.apache.org_authenticationpolicies.yaml
diff --git a/test/crds/auth/dubbo.apache.org_authorizationpolicies.yaml
b/test/auth/dubbo.apache.org_authorizationpolicies.yaml
similarity index 100%
rename from test/crds/auth/dubbo.apache.org_authorizationpolicies.yaml
rename to test/auth/dubbo.apache.org_authorizationpolicies.yaml
diff --git a/test/control-plane/cp.yaml b/test/cp/cp.yaml
similarity index 100%
rename from test/control-plane/cp.yaml
rename to test/cp/cp.yaml
diff --git a/test/control-plane/crds/dubbo.io_conditionroutes.yaml
b/test/cp/crds/dubbo.io_conditionroutes.yaml
similarity index 100%
rename from test/control-plane/crds/dubbo.io_conditionroutes.yaml
rename to test/cp/crds/dubbo.io_conditionroutes.yaml
diff --git a/test/control-plane/crds/dubbo.io_dataplaneinsights.yaml
b/test/cp/crds/dubbo.io_dataplaneinsights.yaml
similarity index 100%
rename from test/control-plane/crds/dubbo.io_dataplaneinsights.yaml
rename to test/cp/crds/dubbo.io_dataplaneinsights.yaml
diff --git a/test/control-plane/crds/dubbo.io_dataplanes.yaml
b/test/cp/crds/dubbo.io_dataplanes.yaml
similarity index 100%
rename from test/control-plane/crds/dubbo.io_dataplanes.yaml
rename to test/cp/crds/dubbo.io_dataplanes.yaml
diff --git a/test/control-plane/crds/dubbo.io_datasources.yaml
b/test/cp/crds/dubbo.io_datasources.yaml
similarity index 100%
rename from test/control-plane/crds/dubbo.io_datasources.yaml
rename to test/cp/crds/dubbo.io_datasources.yaml
diff --git a/test/control-plane/crds/dubbo.io_dynamicconfigs.yaml
b/test/cp/crds/dubbo.io_dynamicconfigs.yaml
similarity index 100%
rename from test/control-plane/crds/dubbo.io_dynamicconfigs.yaml
rename to test/cp/crds/dubbo.io_dynamicconfigs.yaml
diff --git a/test/control-plane/crds/dubbo.io_mappings.yaml
b/test/cp/crds/dubbo.io_mappings.yaml
similarity index 100%
rename from test/control-plane/crds/dubbo.io_mappings.yaml
rename to test/cp/crds/dubbo.io_mappings.yaml
diff --git a/test/control-plane/crds/dubbo.io_meshes.yaml
b/test/cp/crds/dubbo.io_meshes.yaml
similarity index 100%
rename from test/control-plane/crds/dubbo.io_meshes.yaml
rename to test/cp/crds/dubbo.io_meshes.yaml
diff --git a/test/control-plane/crds/dubbo.io_meshinsights.yaml
b/test/cp/crds/dubbo.io_meshinsights.yaml
similarity index 100%
rename from test/control-plane/crds/dubbo.io_meshinsights.yaml
rename to test/cp/crds/dubbo.io_meshinsights.yaml
diff --git a/test/control-plane/crds/dubbo.io_metadata.yaml
b/test/cp/crds/dubbo.io_metadata.yaml
similarity index 100%
rename from test/control-plane/crds/dubbo.io_metadata.yaml
rename to test/cp/crds/dubbo.io_metadata.yaml
diff --git a/test/control-plane/crds/dubbo.io_secrets.yaml
b/test/cp/crds/dubbo.io_secrets.yaml
similarity index 100%
rename from test/control-plane/crds/dubbo.io_secrets.yaml
rename to test/cp/crds/dubbo.io_secrets.yaml
diff --git a/test/control-plane/crds/dubbo.io_servicenamemappings.yaml
b/test/cp/crds/dubbo.io_servicenamemappings.yaml
similarity index 100%
rename from test/control-plane/crds/dubbo.io_servicenamemappings.yaml
rename to test/cp/crds/dubbo.io_servicenamemappings.yaml
diff --git a/test/control-plane/crds/dubbo.io_tagroutes.yaml
b/test/cp/crds/dubbo.io_tagroutes.yaml
similarity index 100%
rename from test/control-plane/crds/dubbo.io_tagroutes.yaml
rename to test/cp/crds/dubbo.io_tagroutes.yaml
diff --git a/test/control-plane/crds/dubbo.io_zoneegresses.yaml
b/test/cp/crds/dubbo.io_zoneegresses.yaml
similarity index 100%
rename from test/control-plane/crds/dubbo.io_zoneegresses.yaml
rename to test/cp/crds/dubbo.io_zoneegresses.yaml
diff --git a/test/control-plane/crds/dubbo.io_zoneegressinsights.yaml
b/test/cp/crds/dubbo.io_zoneegressinsights.yaml
similarity index 100%
rename from test/control-plane/crds/dubbo.io_zoneegressinsights.yaml
rename to test/cp/crds/dubbo.io_zoneegressinsights.yaml
diff --git a/test/control-plane/crds/dubbo.io_zoneingresses.yaml
b/test/cp/crds/dubbo.io_zoneingresses.yaml
similarity index 100%
rename from test/control-plane/crds/dubbo.io_zoneingresses.yaml
rename to test/cp/crds/dubbo.io_zoneingresses.yaml
diff --git a/test/control-plane/crds/dubbo.io_zoneingressinsights.yaml
b/test/cp/crds/dubbo.io_zoneingressinsights.yaml
similarity index 100%
rename from test/control-plane/crds/dubbo.io_zoneingressinsights.yaml
rename to test/cp/crds/dubbo.io_zoneingressinsights.yaml
diff --git a/test/control-plane/crds/dubbo.io_zoneinsights.yaml
b/test/cp/crds/dubbo.io_zoneinsights.yaml
similarity index 100%
rename from test/control-plane/crds/dubbo.io_zoneinsights.yaml
rename to test/cp/crds/dubbo.io_zoneinsights.yaml
diff --git a/test/control-plane/crds/dubbo.io_zones.yaml
b/test/cp/crds/dubbo.io_zones.yaml
similarity index 100%
rename from test/control-plane/crds/dubbo.io_zones.yaml
rename to test/cp/crds/dubbo.io_zones.yaml
diff --git a/test/proxy/dp-bootstrap.yaml b/test/dp/dp-bootstrap.yaml
similarity index 100%
rename from test/proxy/dp-bootstrap.yaml
rename to test/dp/dp-bootstrap.yaml
diff --git a/test/proxy/dp.Dockerfile b/test/dp/dp.Dockerfile
similarity index 100%
rename from test/proxy/dp.Dockerfile
rename to test/dp/dp.Dockerfile
diff --git a/test/proxy/dp/ingress.yaml b/test/dp/dp/ingress.yaml
similarity index 100%
rename from test/proxy/dp/ingress.yaml
rename to test/dp/dp/ingress.yaml
diff --git a/test/crds/dubbo.apache.org_conditionroutes.yaml
b/test/traffic/dubbo.apache.org_conditionroutes.yaml
similarity index 100%
rename from test/crds/dubbo.apache.org_conditionroutes.yaml
rename to test/traffic/dubbo.apache.org_conditionroutes.yaml
diff --git a/test/crds/dubbo.apache.org_dynamicconfigs.yaml
b/test/traffic/dubbo.apache.org_dynamicconfigs.yaml
similarity index 100%
rename from test/crds/dubbo.apache.org_dynamicconfigs.yaml
rename to test/traffic/dubbo.apache.org_dynamicconfigs.yaml
diff --git a/test/crds/dubbo.apache.org_servicenamemappings.yaml
b/test/traffic/dubbo.apache.org_servicenamemappings.yaml
similarity index 100%
rename from test/crds/dubbo.apache.org_servicenamemappings.yaml
rename to test/traffic/dubbo.apache.org_servicenamemappings.yaml
diff --git a/test/crds/dubbo.apache.org_tagroutes.yaml
b/test/traffic/dubbo.apache.org_tagroutes.yaml
similarity index 100%
rename from test/crds/dubbo.apache.org_tagroutes.yaml
rename to test/traffic/dubbo.apache.org_tagroutes.yaml
