[chore] Change deploy directory

apache · Sep 25, 2024 · b678297 · b678297
1 parent f80fd9e
commit b678297
Show file tree

Hide file tree

Showing 93 changed files with 4 additions and 4 deletions.
diff --git a/app/dubboctl/identifier/env.go b/app/dubboctl/identifier/env.go
@@ -21,7 +21,7 @@ import (
 
 import (
 	"github.com/apache/dubbo-kubernetes/app/dubboctl/internal/filesystem"
-	"github.com/apache/dubbo-kubernetes/deploy"
+	"github.com/apache/dubbo-kubernetes/manifests"
 )
 
 var (
@@ -44,5 +44,5 @@ var (
 var UnionFS filesystem.UnionFS
 
 func init() {
-	UnionFS = filesystem.NewUnionFS(deploy.EmbedRootFS)
+	UnionFS = filesystem.NewUnionFS(manifests.EmbedRootFS)
 }
diff --git a/...addons/dashboards/external-dashboard.json → ...addons/dashboards/external-dashboard.json b/...addons/dashboards/external-dashboard.json → ...addons/dashboards/external-dashboard.json
diff --git a/deploy/addons/env.sh → manifests/addons/env.sh b/deploy/addons/env.sh → manifests/addons/env.sh
diff --git a/deploy/addons/values-grafana.yaml → manifests/addons/values-grafana.yaml b/deploy/addons/values-grafana.yaml → manifests/addons/values-grafana.yaml
diff --git a/deploy/addons/values-prometheus.yaml → manifests/addons/values-prometheus.yaml b/deploy/addons/values-prometheus.yaml → manifests/addons/values-prometheus.yaml
diff --git a/deploy/addons/values-skywalking.yaml → manifests/addons/values-skywalking.yaml b/deploy/addons/values-skywalking.yaml → manifests/addons/values-skywalking.yaml
diff --git a/deploy/addons/values-zipkin.yaml → manifests/addons/values-zipkin.yaml b/deploy/addons/values-zipkin.yaml → manifests/addons/values-zipkin.yaml
diff --git a/deploy/addons/values-zookeeper.yaml → manifests/addons/values-zookeeper.yaml b/deploy/addons/values-zookeeper.yaml → manifests/addons/values-zookeeper.yaml
diff --git a/deploy/charts/README.md → manifests/charts/README.md b/deploy/charts/README.md → manifests/charts/README.md
diff --git a/deploy/charts/admin/.helmignore → manifests/charts/admin/.helmignore b/deploy/charts/admin/.helmignore → manifests/charts/admin/.helmignore
diff --git a/deploy/charts/admin/Chart.lock → manifests/charts/admin/Chart.lock b/deploy/charts/admin/Chart.lock → manifests/charts/admin/Chart.lock
diff --git a/deploy/charts/admin/Chart.yaml → manifests/charts/admin/Chart.yaml b/deploy/charts/admin/Chart.yaml → manifests/charts/admin/Chart.yaml
diff --git a/deploy/charts/admin/README.md → manifests/charts/admin/README.md b/deploy/charts/admin/README.md → manifests/charts/admin/README.md
diff --git a/deploy/charts/admin/README.md.gotmpl → manifests/charts/admin/README.md.gotmpl b/deploy/charts/admin/README.md.gotmpl → manifests/charts/admin/README.md.gotmpl
diff --git a/...arts/admin/changelog/helm-chart.md.gotmpl → ...arts/admin/changelog/helm-chart.md.gotmpl b/...arts/admin/changelog/helm-chart.md.gotmpl → ...arts/admin/changelog/helm-chart.md.gotmpl
diff --git a/.../admin/crds/dubbo.io_conditionroutes.yaml → .../admin/crds/dubbo.io_conditionroutes.yaml b/.../admin/crds/dubbo.io_conditionroutes.yaml → .../admin/crds/dubbo.io_conditionroutes.yaml
diff --git a/...dmin/crds/dubbo.io_dataplaneinsights.yaml → ...dmin/crds/dubbo.io_dataplaneinsights.yaml b/...dmin/crds/dubbo.io_dataplaneinsights.yaml → ...dmin/crds/dubbo.io_dataplaneinsights.yaml
diff --git a/...harts/admin/crds/dubbo.io_dataplanes.yaml → ...harts/admin/crds/dubbo.io_dataplanes.yaml b/...harts/admin/crds/dubbo.io_dataplanes.yaml → ...harts/admin/crds/dubbo.io_dataplanes.yaml
diff --git a/...arts/admin/crds/dubbo.io_datasources.yaml → ...arts/admin/crds/dubbo.io_datasources.yaml b/...arts/admin/crds/dubbo.io_datasources.yaml → ...arts/admin/crds/dubbo.io_datasources.yaml
diff --git a/...s/admin/crds/dubbo.io_dynamicconfigs.yaml → ...s/admin/crds/dubbo.io_dynamicconfigs.yaml b/...s/admin/crds/dubbo.io_dynamicconfigs.yaml → ...s/admin/crds/dubbo.io_dynamicconfigs.yaml
diff --git a/.../charts/admin/crds/dubbo.io_mappings.yaml → .../charts/admin/crds/dubbo.io_mappings.yaml b/.../charts/admin/crds/dubbo.io_mappings.yaml → .../charts/admin/crds/dubbo.io_mappings.yaml
diff --git a/...oy/charts/admin/crds/dubbo.io_meshes.yaml → ...ts/charts/admin/crds/dubbo.io_meshes.yaml b/...oy/charts/admin/crds/dubbo.io_meshes.yaml → ...ts/charts/admin/crds/dubbo.io_meshes.yaml
diff --git a/...rts/admin/crds/dubbo.io_meshinsights.yaml → ...rts/admin/crds/dubbo.io_meshinsights.yaml b/...rts/admin/crds/dubbo.io_meshinsights.yaml → ...rts/admin/crds/dubbo.io_meshinsights.yaml
diff --git a/.../charts/admin/crds/dubbo.io_metadata.yaml → .../charts/admin/crds/dubbo.io_metadata.yaml b/.../charts/admin/crds/dubbo.io_metadata.yaml → .../charts/admin/crds/dubbo.io_metadata.yaml
diff --git a/...y/charts/admin/crds/dubbo.io_secrets.yaml → ...s/charts/admin/crds/dubbo.io_secrets.yaml b/...y/charts/admin/crds/dubbo.io_secrets.yaml → ...s/charts/admin/crds/dubbo.io_secrets.yaml
diff --git a/...in/crds/dubbo.io_servicenamemappings.yaml → ...in/crds/dubbo.io_servicenamemappings.yaml b/...in/crds/dubbo.io_servicenamemappings.yaml → ...in/crds/dubbo.io_servicenamemappings.yaml
diff --git a/...charts/admin/crds/dubbo.io_tagroutes.yaml → ...charts/admin/crds/dubbo.io_tagroutes.yaml b/...charts/admin/crds/dubbo.io_tagroutes.yaml → ...charts/admin/crds/dubbo.io_tagroutes.yaml
diff --git a/...rts/admin/crds/dubbo.io_zoneegresses.yaml → ...rts/admin/crds/dubbo.io_zoneegresses.yaml b/...rts/admin/crds/dubbo.io_zoneegresses.yaml → ...rts/admin/crds/dubbo.io_zoneegresses.yaml
diff --git a/...min/crds/dubbo.io_zoneegressinsights.yaml → ...min/crds/dubbo.io_zoneegressinsights.yaml b/...min/crds/dubbo.io_zoneegressinsights.yaml → ...min/crds/dubbo.io_zoneegressinsights.yaml
diff --git a/...ts/admin/crds/dubbo.io_zoneingresses.yaml → ...ts/admin/crds/dubbo.io_zoneingresses.yaml b/...ts/admin/crds/dubbo.io_zoneingresses.yaml → ...ts/admin/crds/dubbo.io_zoneingresses.yaml
diff --git a/...in/crds/dubbo.io_zoneingressinsights.yaml → ...in/crds/dubbo.io_zoneingressinsights.yaml b/...in/crds/dubbo.io_zoneingressinsights.yaml → ...in/crds/dubbo.io_zoneingressinsights.yaml
diff --git a/...rts/admin/crds/dubbo.io_zoneinsights.yaml → ...rts/admin/crds/dubbo.io_zoneinsights.yaml b/...rts/admin/crds/dubbo.io_zoneinsights.yaml → ...rts/admin/crds/dubbo.io_zoneinsights.yaml
diff --git a/deploy/charts/admin/crds/dubbo.io_zones.yaml → ...sts/charts/admin/crds/dubbo.io_zones.yaml b/deploy/charts/admin/crds/dubbo.io_zones.yaml → ...sts/charts/admin/crds/dubbo.io_zones.yaml
diff --git a/deploy/charts/admin/templates/NOTES.txt → manifests/charts/admin/templates/NOTES.txt b/deploy/charts/admin/templates/NOTES.txt → manifests/charts/admin/templates/NOTES.txt
diff --git a/...rts/admin/templates/admin/admin-cert.yaml → ...rts/admin/templates/admin/admin-cert.yaml b/...rts/admin/templates/admin/admin-cert.yaml → ...rts/admin/templates/admin/admin-cert.yaml
diff --git a/...harts/admin/templates/admin/admin-cm.yaml → ...harts/admin/templates/admin/admin-cm.yaml b/...harts/admin/templates/admin/admin-cm.yaml → ...harts/admin/templates/admin/admin-cm.yaml
diff --git a/...arts/admin/templates/admin/admin-dep.yaml → ...arts/admin/templates/admin/admin-dep.yaml b/...arts/admin/templates/admin/admin-dep.yaml → ...arts/admin/templates/admin/admin-dep.yaml
diff --git a/...harts/admin/templates/admin/admin-np.yaml → ...harts/admin/templates/admin/admin-np.yaml b/...harts/admin/templates/admin/admin-np.yaml → ...harts/admin/templates/admin/admin-np.yaml
diff --git a/...harts/admin/templates/admin/admin-ns.yaml → ...harts/admin/templates/admin/admin-ns.yaml b/...harts/admin/templates/admin/admin-ns.yaml → ...harts/admin/templates/admin/admin-ns.yaml
diff --git a/...arts/admin/templates/admin/admin-pdb.yaml → ...arts/admin/templates/admin/admin-pdb.yaml b/...arts/admin/templates/admin/admin-pdb.yaml → ...arts/admin/templates/admin/admin-pdb.yaml
diff --git a/...arts/admin/templates/admin/admin-psp.yaml → ...arts/admin/templates/admin/admin-psp.yaml b/...arts/admin/templates/admin/admin-psp.yaml → ...arts/admin/templates/admin/admin-psp.yaml
diff --git a/...arts/admin/templates/admin/admin-pvc.yaml → ...arts/admin/templates/admin/admin-pvc.yaml b/...arts/admin/templates/admin/admin-pvc.yaml → ...arts/admin/templates/admin/admin-pvc.yaml
diff --git a/...rts/admin/templates/admin/admin-rbac.yaml → ...rts/admin/templates/admin/admin-rbac.yaml b/...rts/admin/templates/admin/admin-rbac.yaml → ...rts/admin/templates/admin/admin-rbac.yaml
diff --git a/...arts/admin/templates/admin/admin-sts.yaml → ...arts/admin/templates/admin/admin-sts.yaml b/...arts/admin/templates/admin/admin-sts.yaml → ...arts/admin/templates/admin/admin-sts.yaml
diff --git a/...arts/admin/templates/admin/admin-svc.yaml → ...arts/admin/templates/admin/admin-svc.yaml b/...arts/admin/templates/admin/admin-svc.yaml → ...arts/admin/templates/admin/admin-svc.yaml
diff --git a/...s/admin/templates/custom/_apiversions.tpl → ...s/admin/templates/custom/_apiversions.tpl b/...s/admin/templates/custom/_apiversions.tpl → ...s/admin/templates/custom/_apiversions.tpl
diff --git a/...charts/admin/templates/custom/_extras.tpl → ...charts/admin/templates/custom/_extras.tpl b/...charts/admin/templates/custom/_extras.tpl → ...charts/admin/templates/custom/_extras.tpl
diff --git a/...rts/admin/templates/custom/_ingresses.tpl → ...rts/admin/templates/custom/_ingresses.tpl b/...rts/admin/templates/custom/_ingresses.tpl → ...rts/admin/templates/custom/_ingresses.tpl
diff --git a/...charts/admin/templates/custom/_labels.tpl → ...charts/admin/templates/custom/_labels.tpl b/...charts/admin/templates/custom/_labels.tpl → ...charts/admin/templates/custom/_labels.tpl
diff --git a/...harts/admin/templates/custom/_matches.tpl → ...harts/admin/templates/custom/_matches.tpl b/...harts/admin/templates/custom/_matches.tpl → ...harts/admin/templates/custom/_matches.tpl
diff --git a/.../charts/admin/templates/custom/_names.tpl → .../charts/admin/templates/custom/_names.tpl b/.../charts/admin/templates/custom/_names.tpl → .../charts/admin/templates/custom/_names.tpl
diff --git a/...ts/admin/templates/custom/_namespaces.tpl → ...ts/admin/templates/custom/_namespaces.tpl b/...ts/admin/templates/custom/_namespaces.tpl → ...ts/admin/templates/custom/_namespaces.tpl
diff --git a/...rts/admin/templates/custom/_selectors.tpl → ...rts/admin/templates/custom/_selectors.tpl b/...rts/admin/templates/custom/_selectors.tpl → ...rts/admin/templates/custom/_selectors.tpl
diff --git a/...arts/admin/templates/custom/_services.tpl → ...arts/admin/templates/custom/_services.tpl b/...arts/admin/templates/custom/_services.tpl → ...arts/admin/templates/custom/_services.tpl
diff --git a/...plates/custom/jobs/jobs-crds-scripts.yaml → ...plates/custom/jobs/jobs-crds-scripts.yaml b/...plates/custom/jobs/jobs-crds-scripts.yaml → ...plates/custom/jobs/jobs-crds-scripts.yaml
diff --git a/...dmin/templates/custom/jobs/jobs-crds.yaml → ...dmin/templates/custom/jobs/jobs-crds.yaml b/...dmin/templates/custom/jobs/jobs-crds.yaml → ...dmin/templates/custom/jobs/jobs-crds.yaml
diff --git a/...plates/exposer/ingress/ingress-class.yaml → ...plates/exposer/ingress/ingress-class.yaml b/...plates/exposer/ingress/ingress-class.yaml → ...plates/exposer/ingress/ingress-class.yaml
diff --git a/...emplates/exposer/ingress/ingress-dep.yaml → ...emplates/exposer/ingress/ingress-dep.yaml b/...emplates/exposer/ingress/ingress-dep.yaml → ...emplates/exposer/ingress/ingress-dep.yaml
diff --git a/...mplates/exposer/ingress/ingress-rbac.yaml → ...mplates/exposer/ingress/ingress-rbac.yaml b/...mplates/exposer/ingress/ingress-rbac.yaml → ...mplates/exposer/ingress/ingress-rbac.yaml
diff --git a/...in/templates/exposer/ingress/ingress.yaml → ...in/templates/exposer/ingress/ingress.yaml b/...in/templates/exposer/ingress/ingress.yaml → ...in/templates/exposer/ingress/ingress.yaml
diff --git a/...in/templates/register/nacos/nacos-cm.yaml → ...in/templates/register/nacos/nacos-cm.yaml b/...in/templates/register/nacos/nacos-cm.yaml → ...in/templates/register/nacos/nacos-cm.yaml
diff --git a/...n/templates/register/nacos/nacos-sts.yaml → ...n/templates/register/nacos/nacos-sts.yaml b/...n/templates/register/nacos/nacos-sts.yaml → ...n/templates/register/nacos/nacos-sts.yaml
diff --git a/...n/templates/register/nacos/nacos-svc.yaml → ...n/templates/register/nacos/nacos-svc.yaml b/...n/templates/register/nacos/nacos-svc.yaml → ...n/templates/register/nacos/nacos-svc.yaml
diff --git a/...ts/admin/templates/register/zk/zk-cm.yaml → ...ts/admin/templates/register/zk/zk-cm.yaml b/...ts/admin/templates/register/zk/zk-cm.yaml → ...ts/admin/templates/register/zk/zk-cm.yaml
diff --git a/...s/admin/templates/register/zk/zk-sts.yaml → ...s/admin/templates/register/zk/zk-sts.yaml b/...s/admin/templates/register/zk/zk-sts.yaml → ...s/admin/templates/register/zk/zk-sts.yaml
diff --git a/...s/admin/templates/register/zk/zk-svc.yaml → ...s/admin/templates/register/zk/zk-svc.yaml b/...s/admin/templates/register/zk/zk-svc.yaml → ...s/admin/templates/register/zk/zk-svc.yaml
diff --git a/.../templates/traffic/traffic-authority.yaml → .../templates/traffic/traffic-authority.yaml b/.../templates/traffic/traffic-authority.yaml → .../templates/traffic/traffic-authority.yaml
diff --git a/...dmin/templates/traffic/traffic-rules.yaml → ...dmin/templates/traffic/traffic-rules.yaml b/...dmin/templates/traffic/traffic-rules.yaml → ...dmin/templates/traffic/traffic-rules.yaml
diff --git a/deploy/charts/admin/values.schema.json → manifests/charts/admin/values.schema.json b/deploy/charts/admin/values.schema.json → manifests/charts/admin/values.schema.json
diff --git a/deploy/charts/admin/values.yaml → manifests/charts/admin/values.yaml b/deploy/charts/admin/values.yaml → manifests/charts/admin/values.yaml
diff --git a/deploy/charts/nacos/.helmignore → manifests/charts/nacos/.helmignore b/deploy/charts/nacos/.helmignore → manifests/charts/nacos/.helmignore
diff --git a/deploy/charts/nacos/Chart.yaml → manifests/charts/nacos/Chart.yaml b/deploy/charts/nacos/Chart.yaml → manifests/charts/nacos/Chart.yaml
diff --git a/deploy/charts/nacos/templates/NOTES.txt → manifests/charts/nacos/templates/NOTES.txt b/deploy/charts/nacos/templates/NOTES.txt → manifests/charts/nacos/templates/NOTES.txt
diff --git a/deploy/charts/nacos/templates/_charts.tpl → manifests/charts/nacos/templates/_charts.tpl b/deploy/charts/nacos/templates/_charts.tpl → manifests/charts/nacos/templates/_charts.tpl
diff --git a/deploy/charts/nacos/templates/configmap.yaml → ...sts/charts/nacos/templates/configmap.yaml b/deploy/charts/nacos/templates/configmap.yaml → ...sts/charts/nacos/templates/configmap.yaml
diff --git a/...oy/charts/nacos/templates/extra-list.yaml → ...ts/charts/nacos/templates/extra-list.yaml b/...oy/charts/nacos/templates/extra-list.yaml → ...ts/charts/nacos/templates/extra-list.yaml
diff --git a/...charts/nacos/templates/networkpolicy.yaml → ...charts/nacos/templates/networkpolicy.yaml b/...charts/nacos/templates/networkpolicy.yaml → ...charts/nacos/templates/networkpolicy.yaml
diff --git a/deploy/charts/nacos/templates/pdb.yaml → manifests/charts/nacos/templates/pdb.yaml b/deploy/charts/nacos/templates/pdb.yaml → manifests/charts/nacos/templates/pdb.yaml
diff --git a/...y/charts/nacos/templates/statefulset.yaml → ...s/charts/nacos/templates/statefulset.yaml b/...y/charts/nacos/templates/statefulset.yaml → ...s/charts/nacos/templates/statefulset.yaml
diff --git a/.../charts/nacos/templates/svc-headless.yaml → .../charts/nacos/templates/svc-headless.yaml b/.../charts/nacos/templates/svc-headless.yaml → .../charts/nacos/templates/svc-headless.yaml
diff --git a/deploy/charts/nacos/templates/svc.yaml → manifests/charts/nacos/templates/svc.yaml b/deploy/charts/nacos/templates/svc.yaml → manifests/charts/nacos/templates/svc.yaml
diff --git a/deploy/charts/nacos/values.yaml → manifests/charts/nacos/values.yaml b/deploy/charts/nacos/values.yaml → manifests/charts/nacos/values.yaml
diff --git a/deploy/embedded.go → manifests/embedded.go b/deploy/embedded.go → manifests/embedded.go
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package deploy
+package manifests
 
 import (
 	"embed"

diff --git a/deploy/example/admin.yaml → manifests/example/admin.yaml b/deploy/example/admin.yaml → manifests/example/admin.yaml
diff --git a/deploy/example/grafana.yaml → manifests/example/grafana.yaml b/deploy/example/grafana.yaml → manifests/example/grafana.yaml
diff --git a/deploy/example/prometheus.yaml → manifests/example/prometheus.yaml b/deploy/example/prometheus.yaml → manifests/example/prometheus.yaml
diff --git a/deploy/example/skywalking.yaml → manifests/example/skywalking.yaml b/deploy/example/skywalking.yaml → manifests/example/skywalking.yaml
diff --git a/deploy/example/zipkin.yaml → manifests/example/zipkin.yaml b/deploy/example/zipkin.yaml → manifests/example/zipkin.yaml
diff --git a/deploy/example/zookeeper.yaml → manifests/example/zookeeper.yaml b/deploy/example/zookeeper.yaml → manifests/example/zookeeper.yaml
diff --git a/deploy/horus/horus.yaml → manifests/horus/horus.yaml b/deploy/horus/horus.yaml → manifests/horus/horus.yaml
diff --git a/deploy/profiles/default.yaml → manifests/profiles/default.yaml b/deploy/profiles/default.yaml → manifests/profiles/default.yaml
diff --git a/deploy/profiles/demo.yaml → manifests/profiles/demo.yaml b/deploy/profiles/demo.yaml → manifests/profiles/demo.yaml
diff --git a/tests/dp/dp.Dockerfile b/tests/dp/dp.Dockerfile
@@ -43,7 +43,7 @@ COPY pkg pkg/
 COPY app app/
 COPY api api/
 COPY conf conf/
-COPY deploy deploy/
+COPY manifests manifests/
 COPY generate generate/
 COPY test/proxy/dp test/proxy/dp