From c3e246610691e2212fc6ed481c310ca4ba0698d7 Mon Sep 17 00:00:00 2001 From: mfordjody <11638005@qq.com> Date: Sun, 22 Sep 2024 12:05:04 +0800 Subject: [PATCH] [chore] Organize the project directory structure (#364) * [chore] Organize the project directory structure fix typo fix typo * fix typo * fix typo * fix typo * fix typo --- app/dubboctl/identifier/env.go | 13 +++++-------- deploy/{kubernetes => example}/dubbo-admin.yaml | 0 deploy/{kubernetes => example}/grafana.yaml | 0 deploy/{kubernetes => example}/prometheus.yaml | 0 deploy/{kubernetes => example}/skywalking.yaml | 0 deploy/{kubernetes => example}/zipkin.yaml | 0 deploy/{kubernetes => example}/zookeeper.yaml | 0 .../dubbo.apache.org_authenticationpolicies.yaml | 0 .../dubbo.apache.org_authorizationpolicies.yaml | 0 .../crds}/dubbo.apache.org_conditionroutes.yaml | 0 .../crds}/dubbo.apache.org_dynamicconfigs.yaml | 0 .../crds}/dubbo.apache.org_servicenamemappings.yaml | 0 .../crds}/dubbo.apache.org_tagroutes.yaml | 0 13 files changed, 5 insertions(+), 8 deletions(-) rename deploy/{kubernetes => example}/dubbo-admin.yaml (100%) rename deploy/{kubernetes => example}/grafana.yaml (100%) rename deploy/{kubernetes => example}/prometheus.yaml (100%) rename deploy/{kubernetes => example}/skywalking.yaml (100%) rename deploy/{kubernetes => example}/zipkin.yaml (100%) rename deploy/{kubernetes => example}/zookeeper.yaml (100%) rename {deploy/manifests => test/crds/auth}/dubbo.apache.org_authenticationpolicies.yaml (100%) rename {deploy/manifests => test/crds/auth}/dubbo.apache.org_authorizationpolicies.yaml (100%) rename {deploy/manifests => test/crds}/dubbo.apache.org_conditionroutes.yaml (100%) rename {deploy/manifests => test/crds}/dubbo.apache.org_dynamicconfigs.yaml (100%) rename {deploy/manifests => test/crds}/dubbo.apache.org_servicenamemappings.yaml (100%) rename {deploy/manifests => test/crds}/dubbo.apache.org_tagroutes.yaml (100%) diff --git a/app/dubboctl/identifier/env.go b/app/dubboctl/identifier/env.go index 6caa283e2..24dcf529f 100644 --- a/app/dubboctl/identifier/env.go +++ b/app/dubboctl/identifier/env.go @@ -34,14 +34,11 @@ var ( chartsUri = deployUri.JoinPath("charts") profilesUri = deployUri.JoinPath("profiles") addonsUri = deployUri.JoinPath("addons") - addonDashboardsUri = addonsUri.JoinPath("dashboards") - addonManifestsUri = addonsUri.JoinPath("manifests") - - Charts = chartsUri.String() - Profiles = profilesUri.String() - Addons = addonsUri.String() - AddonDashboards = addonDashboardsUri.String() - AddonManifests = addonManifestsUri.String() + addonDashboardsUri = addonsUri.JoinPath("addons/dashboards") + Charts = chartsUri.String() + Addons = addonsUri.String() + AddonDashboards = addonDashboardsUri.String() + Profiles = profilesUri.String() ) var UnionFS filesystem.UnionFS diff --git a/deploy/kubernetes/dubbo-admin.yaml b/deploy/example/dubbo-admin.yaml similarity index 100% rename from deploy/kubernetes/dubbo-admin.yaml rename to deploy/example/dubbo-admin.yaml diff --git a/deploy/kubernetes/grafana.yaml b/deploy/example/grafana.yaml similarity index 100% rename from deploy/kubernetes/grafana.yaml rename to deploy/example/grafana.yaml diff --git a/deploy/kubernetes/prometheus.yaml b/deploy/example/prometheus.yaml similarity index 100% rename from deploy/kubernetes/prometheus.yaml rename to deploy/example/prometheus.yaml diff --git a/deploy/kubernetes/skywalking.yaml b/deploy/example/skywalking.yaml similarity index 100% rename from deploy/kubernetes/skywalking.yaml rename to deploy/example/skywalking.yaml diff --git a/deploy/kubernetes/zipkin.yaml b/deploy/example/zipkin.yaml similarity index 100% rename from deploy/kubernetes/zipkin.yaml rename to deploy/example/zipkin.yaml diff --git a/deploy/kubernetes/zookeeper.yaml b/deploy/example/zookeeper.yaml similarity index 100% rename from deploy/kubernetes/zookeeper.yaml rename to deploy/example/zookeeper.yaml diff --git a/deploy/manifests/dubbo.apache.org_authenticationpolicies.yaml b/test/crds/auth/dubbo.apache.org_authenticationpolicies.yaml similarity index 100% rename from deploy/manifests/dubbo.apache.org_authenticationpolicies.yaml rename to test/crds/auth/dubbo.apache.org_authenticationpolicies.yaml diff --git a/deploy/manifests/dubbo.apache.org_authorizationpolicies.yaml b/test/crds/auth/dubbo.apache.org_authorizationpolicies.yaml similarity index 100% rename from deploy/manifests/dubbo.apache.org_authorizationpolicies.yaml rename to test/crds/auth/dubbo.apache.org_authorizationpolicies.yaml diff --git a/deploy/manifests/dubbo.apache.org_conditionroutes.yaml b/test/crds/dubbo.apache.org_conditionroutes.yaml similarity index 100% rename from deploy/manifests/dubbo.apache.org_conditionroutes.yaml rename to test/crds/dubbo.apache.org_conditionroutes.yaml diff --git a/deploy/manifests/dubbo.apache.org_dynamicconfigs.yaml b/test/crds/dubbo.apache.org_dynamicconfigs.yaml similarity index 100% rename from deploy/manifests/dubbo.apache.org_dynamicconfigs.yaml rename to test/crds/dubbo.apache.org_dynamicconfigs.yaml diff --git a/deploy/manifests/dubbo.apache.org_servicenamemappings.yaml b/test/crds/dubbo.apache.org_servicenamemappings.yaml similarity index 100% rename from deploy/manifests/dubbo.apache.org_servicenamemappings.yaml rename to test/crds/dubbo.apache.org_servicenamemappings.yaml diff --git a/deploy/manifests/dubbo.apache.org_tagroutes.yaml b/test/crds/dubbo.apache.org_tagroutes.yaml similarity index 100% rename from deploy/manifests/dubbo.apache.org_tagroutes.yaml rename to test/crds/dubbo.apache.org_tagroutes.yaml