From b6782975dfa43e220ee6f5b3c57057214296391d Mon Sep 17 00:00:00 2001 From: mfordjody <11638005@qq.com> Date: Wed, 25 Sep 2024 17:59:13 +0800 Subject: [PATCH] [chore] Change deploy directory --- app/dubboctl/identifier/env.go | 4 ++-- .../addons/dashboards/external-dashboard.json | 0 {deploy => manifests}/addons/env.sh | 0 {deploy => manifests}/addons/values-grafana.yaml | 0 {deploy => manifests}/addons/values-prometheus.yaml | 0 {deploy => manifests}/addons/values-skywalking.yaml | 0 {deploy => manifests}/addons/values-zipkin.yaml | 0 {deploy => manifests}/addons/values-zookeeper.yaml | 0 {deploy => manifests}/charts/README.md | 0 {deploy => manifests}/charts/admin/.helmignore | 0 {deploy => manifests}/charts/admin/Chart.lock | 0 {deploy => manifests}/charts/admin/Chart.yaml | 0 {deploy => manifests}/charts/admin/README.md | 0 {deploy => manifests}/charts/admin/README.md.gotmpl | 0 .../charts/admin/changelog/helm-chart.md.gotmpl | 0 .../charts/admin/crds/dubbo.io_conditionroutes.yaml | 0 .../charts/admin/crds/dubbo.io_dataplaneinsights.yaml | 0 .../charts/admin/crds/dubbo.io_dataplanes.yaml | 0 .../charts/admin/crds/dubbo.io_datasources.yaml | 0 .../charts/admin/crds/dubbo.io_dynamicconfigs.yaml | 0 .../charts/admin/crds/dubbo.io_mappings.yaml | 0 {deploy => manifests}/charts/admin/crds/dubbo.io_meshes.yaml | 0 .../charts/admin/crds/dubbo.io_meshinsights.yaml | 0 .../charts/admin/crds/dubbo.io_metadata.yaml | 0 {deploy => manifests}/charts/admin/crds/dubbo.io_secrets.yaml | 0 .../charts/admin/crds/dubbo.io_servicenamemappings.yaml | 0 .../charts/admin/crds/dubbo.io_tagroutes.yaml | 0 .../charts/admin/crds/dubbo.io_zoneegresses.yaml | 0 .../charts/admin/crds/dubbo.io_zoneegressinsights.yaml | 0 .../charts/admin/crds/dubbo.io_zoneingresses.yaml | 0 .../charts/admin/crds/dubbo.io_zoneingressinsights.yaml | 0 .../charts/admin/crds/dubbo.io_zoneinsights.yaml | 0 {deploy => manifests}/charts/admin/crds/dubbo.io_zones.yaml | 0 {deploy => manifests}/charts/admin/templates/NOTES.txt | 0 .../charts/admin/templates/admin/admin-cert.yaml | 0 .../charts/admin/templates/admin/admin-cm.yaml | 0 .../charts/admin/templates/admin/admin-dep.yaml | 0 .../charts/admin/templates/admin/admin-np.yaml | 0 .../charts/admin/templates/admin/admin-ns.yaml | 0 .../charts/admin/templates/admin/admin-pdb.yaml | 0 .../charts/admin/templates/admin/admin-psp.yaml | 0 .../charts/admin/templates/admin/admin-pvc.yaml | 0 .../charts/admin/templates/admin/admin-rbac.yaml | 0 .../charts/admin/templates/admin/admin-sts.yaml | 0 .../charts/admin/templates/admin/admin-svc.yaml | 0 .../charts/admin/templates/custom/_apiversions.tpl | 0 .../charts/admin/templates/custom/_extras.tpl | 0 .../charts/admin/templates/custom/_ingresses.tpl | 0 .../charts/admin/templates/custom/_labels.tpl | 0 .../charts/admin/templates/custom/_matches.tpl | 0 .../charts/admin/templates/custom/_names.tpl | 0 .../charts/admin/templates/custom/_namespaces.tpl | 0 .../charts/admin/templates/custom/_selectors.tpl | 0 .../charts/admin/templates/custom/_services.tpl | 0 .../charts/admin/templates/custom/jobs/jobs-crds-scripts.yaml | 0 .../charts/admin/templates/custom/jobs/jobs-crds.yaml | 0 .../charts/admin/templates/exposer/ingress/ingress-class.yaml | 0 .../charts/admin/templates/exposer/ingress/ingress-dep.yaml | 0 .../charts/admin/templates/exposer/ingress/ingress-rbac.yaml | 0 .../charts/admin/templates/exposer/ingress/ingress.yaml | 0 .../charts/admin/templates/register/nacos/nacos-cm.yaml | 0 .../charts/admin/templates/register/nacos/nacos-sts.yaml | 0 .../charts/admin/templates/register/nacos/nacos-svc.yaml | 0 .../charts/admin/templates/register/zk/zk-cm.yaml | 0 .../charts/admin/templates/register/zk/zk-sts.yaml | 0 .../charts/admin/templates/register/zk/zk-svc.yaml | 0 .../charts/admin/templates/traffic/traffic-authority.yaml | 0 .../charts/admin/templates/traffic/traffic-rules.yaml | 0 {deploy => manifests}/charts/admin/values.schema.json | 0 {deploy => manifests}/charts/admin/values.yaml | 0 {deploy => manifests}/charts/nacos/.helmignore | 0 {deploy => manifests}/charts/nacos/Chart.yaml | 0 {deploy => manifests}/charts/nacos/templates/NOTES.txt | 0 {deploy => manifests}/charts/nacos/templates/_charts.tpl | 0 {deploy => manifests}/charts/nacos/templates/configmap.yaml | 0 {deploy => manifests}/charts/nacos/templates/extra-list.yaml | 0 .../charts/nacos/templates/networkpolicy.yaml | 0 {deploy => manifests}/charts/nacos/templates/pdb.yaml | 0 {deploy => manifests}/charts/nacos/templates/statefulset.yaml | 0 .../charts/nacos/templates/svc-headless.yaml | 0 {deploy => manifests}/charts/nacos/templates/svc.yaml | 0 {deploy => manifests}/charts/nacos/values.yaml | 0 {deploy => manifests}/embedded.go | 2 +- {deploy => manifests}/example/admin.yaml | 0 {deploy => manifests}/example/grafana.yaml | 0 {deploy => manifests}/example/prometheus.yaml | 0 {deploy => manifests}/example/skywalking.yaml | 0 {deploy => manifests}/example/zipkin.yaml | 0 {deploy => manifests}/example/zookeeper.yaml | 0 {deploy => manifests}/horus/horus.yaml | 0 {deploy => manifests}/profiles/default.yaml | 0 {deploy => manifests}/profiles/demo.yaml | 0 tests/dp/dp.Dockerfile | 2 +- 93 files changed, 4 insertions(+), 4 deletions(-) rename {deploy => manifests}/addons/dashboards/external-dashboard.json (100%) rename {deploy => manifests}/addons/env.sh (100%) rename {deploy => manifests}/addons/values-grafana.yaml (100%) rename {deploy => manifests}/addons/values-prometheus.yaml (100%) rename {deploy => manifests}/addons/values-skywalking.yaml (100%) rename {deploy => manifests}/addons/values-zipkin.yaml (100%) rename {deploy => manifests}/addons/values-zookeeper.yaml (100%) rename {deploy => manifests}/charts/README.md (100%) rename {deploy => manifests}/charts/admin/.helmignore (100%) rename {deploy => manifests}/charts/admin/Chart.lock (100%) rename {deploy => manifests}/charts/admin/Chart.yaml (100%) rename {deploy => manifests}/charts/admin/README.md (100%) rename {deploy => manifests}/charts/admin/README.md.gotmpl (100%) rename {deploy => manifests}/charts/admin/changelog/helm-chart.md.gotmpl (100%) rename {deploy => manifests}/charts/admin/crds/dubbo.io_conditionroutes.yaml (100%) rename {deploy => manifests}/charts/admin/crds/dubbo.io_dataplaneinsights.yaml (100%) rename {deploy => manifests}/charts/admin/crds/dubbo.io_dataplanes.yaml (100%) rename {deploy => manifests}/charts/admin/crds/dubbo.io_datasources.yaml (100%) rename {deploy => manifests}/charts/admin/crds/dubbo.io_dynamicconfigs.yaml (100%) rename {deploy => manifests}/charts/admin/crds/dubbo.io_mappings.yaml (100%) rename {deploy => manifests}/charts/admin/crds/dubbo.io_meshes.yaml (100%) rename {deploy => manifests}/charts/admin/crds/dubbo.io_meshinsights.yaml (100%) rename {deploy => manifests}/charts/admin/crds/dubbo.io_metadata.yaml (100%) rename {deploy => manifests}/charts/admin/crds/dubbo.io_secrets.yaml (100%) rename {deploy => manifests}/charts/admin/crds/dubbo.io_servicenamemappings.yaml (100%) rename {deploy => manifests}/charts/admin/crds/dubbo.io_tagroutes.yaml (100%) rename {deploy => manifests}/charts/admin/crds/dubbo.io_zoneegresses.yaml (100%) rename {deploy => manifests}/charts/admin/crds/dubbo.io_zoneegressinsights.yaml (100%) rename {deploy => manifests}/charts/admin/crds/dubbo.io_zoneingresses.yaml (100%) rename {deploy => manifests}/charts/admin/crds/dubbo.io_zoneingressinsights.yaml (100%) rename {deploy => manifests}/charts/admin/crds/dubbo.io_zoneinsights.yaml (100%) rename {deploy => manifests}/charts/admin/crds/dubbo.io_zones.yaml (100%) rename {deploy => manifests}/charts/admin/templates/NOTES.txt (100%) rename {deploy => manifests}/charts/admin/templates/admin/admin-cert.yaml (100%) rename {deploy => manifests}/charts/admin/templates/admin/admin-cm.yaml (100%) rename {deploy => manifests}/charts/admin/templates/admin/admin-dep.yaml (100%) rename {deploy => manifests}/charts/admin/templates/admin/admin-np.yaml (100%) rename {deploy => manifests}/charts/admin/templates/admin/admin-ns.yaml (100%) rename {deploy => manifests}/charts/admin/templates/admin/admin-pdb.yaml (100%) rename {deploy => manifests}/charts/admin/templates/admin/admin-psp.yaml (100%) rename {deploy => manifests}/charts/admin/templates/admin/admin-pvc.yaml (100%) rename {deploy => manifests}/charts/admin/templates/admin/admin-rbac.yaml (100%) rename {deploy => manifests}/charts/admin/templates/admin/admin-sts.yaml (100%) rename {deploy => manifests}/charts/admin/templates/admin/admin-svc.yaml (100%) rename {deploy => manifests}/charts/admin/templates/custom/_apiversions.tpl (100%) rename {deploy => manifests}/charts/admin/templates/custom/_extras.tpl (100%) rename {deploy => manifests}/charts/admin/templates/custom/_ingresses.tpl (100%) rename {deploy => manifests}/charts/admin/templates/custom/_labels.tpl (100%) rename {deploy => manifests}/charts/admin/templates/custom/_matches.tpl (100%) rename {deploy => manifests}/charts/admin/templates/custom/_names.tpl (100%) rename {deploy => manifests}/charts/admin/templates/custom/_namespaces.tpl (100%) rename {deploy => manifests}/charts/admin/templates/custom/_selectors.tpl (100%) rename {deploy => manifests}/charts/admin/templates/custom/_services.tpl (100%) rename {deploy => manifests}/charts/admin/templates/custom/jobs/jobs-crds-scripts.yaml (100%) rename {deploy => manifests}/charts/admin/templates/custom/jobs/jobs-crds.yaml (100%) rename {deploy => manifests}/charts/admin/templates/exposer/ingress/ingress-class.yaml (100%) rename {deploy => manifests}/charts/admin/templates/exposer/ingress/ingress-dep.yaml (100%) rename {deploy => manifests}/charts/admin/templates/exposer/ingress/ingress-rbac.yaml (100%) rename {deploy => manifests}/charts/admin/templates/exposer/ingress/ingress.yaml (100%) rename {deploy => manifests}/charts/admin/templates/register/nacos/nacos-cm.yaml (100%) rename {deploy => manifests}/charts/admin/templates/register/nacos/nacos-sts.yaml (100%) rename {deploy => manifests}/charts/admin/templates/register/nacos/nacos-svc.yaml (100%) rename {deploy => manifests}/charts/admin/templates/register/zk/zk-cm.yaml (100%) rename {deploy => manifests}/charts/admin/templates/register/zk/zk-sts.yaml (100%) rename {deploy => manifests}/charts/admin/templates/register/zk/zk-svc.yaml (100%) rename {deploy => manifests}/charts/admin/templates/traffic/traffic-authority.yaml (100%) rename {deploy => manifests}/charts/admin/templates/traffic/traffic-rules.yaml (100%) rename {deploy => manifests}/charts/admin/values.schema.json (100%) rename {deploy => manifests}/charts/admin/values.yaml (100%) rename {deploy => manifests}/charts/nacos/.helmignore (100%) rename {deploy => manifests}/charts/nacos/Chart.yaml (100%) rename {deploy => manifests}/charts/nacos/templates/NOTES.txt (100%) rename {deploy => manifests}/charts/nacos/templates/_charts.tpl (100%) rename {deploy => manifests}/charts/nacos/templates/configmap.yaml (100%) rename {deploy => manifests}/charts/nacos/templates/extra-list.yaml (100%) rename {deploy => manifests}/charts/nacos/templates/networkpolicy.yaml (100%) rename {deploy => manifests}/charts/nacos/templates/pdb.yaml (100%) rename {deploy => manifests}/charts/nacos/templates/statefulset.yaml (100%) rename {deploy => manifests}/charts/nacos/templates/svc-headless.yaml (100%) rename {deploy => manifests}/charts/nacos/templates/svc.yaml (100%) rename {deploy => manifests}/charts/nacos/values.yaml (100%) rename {deploy => manifests}/embedded.go (98%) rename {deploy => manifests}/example/admin.yaml (100%) rename {deploy => manifests}/example/grafana.yaml (100%) rename {deploy => manifests}/example/prometheus.yaml (100%) rename {deploy => manifests}/example/skywalking.yaml (100%) rename {deploy => manifests}/example/zipkin.yaml (100%) rename {deploy => manifests}/example/zookeeper.yaml (100%) rename {deploy => manifests}/horus/horus.yaml (100%) rename {deploy => manifests}/profiles/default.yaml (100%) rename {deploy => manifests}/profiles/demo.yaml (100%) diff --git a/app/dubboctl/identifier/env.go b/app/dubboctl/identifier/env.go index 24dcf529f..d4392ae8f 100644 --- 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/deploy/addons/dashboards/external-dashboard.json b/manifests/addons/dashboards/external-dashboard.json similarity index 100% rename from deploy/addons/dashboards/external-dashboard.json rename to manifests/addons/dashboards/external-dashboard.json diff --git a/deploy/addons/env.sh b/manifests/addons/env.sh similarity index 100% rename from deploy/addons/env.sh rename to manifests/addons/env.sh diff --git a/deploy/addons/values-grafana.yaml b/manifests/addons/values-grafana.yaml similarity index 100% rename from deploy/addons/values-grafana.yaml rename to manifests/addons/values-grafana.yaml diff --git a/deploy/addons/values-prometheus.yaml b/manifests/addons/values-prometheus.yaml similarity index 100% rename from deploy/addons/values-prometheus.yaml rename to manifests/addons/values-prometheus.yaml diff --git a/deploy/addons/values-skywalking.yaml b/manifests/addons/values-skywalking.yaml similarity index 100% rename from deploy/addons/values-skywalking.yaml rename to manifests/addons/values-skywalking.yaml diff --git a/deploy/addons/values-zipkin.yaml b/manifests/addons/values-zipkin.yaml similarity index 100% rename from deploy/addons/values-zipkin.yaml rename to manifests/addons/values-zipkin.yaml diff --git a/deploy/addons/values-zookeeper.yaml b/manifests/addons/values-zookeeper.yaml similarity index 100% rename from deploy/addons/values-zookeeper.yaml rename to manifests/addons/values-zookeeper.yaml diff --git a/deploy/charts/README.md b/manifests/charts/README.md similarity index 100% rename from deploy/charts/README.md rename to manifests/charts/README.md diff --git a/deploy/charts/admin/.helmignore b/manifests/charts/admin/.helmignore similarity index 100% rename from deploy/charts/admin/.helmignore rename to manifests/charts/admin/.helmignore diff --git a/deploy/charts/admin/Chart.lock b/manifests/charts/admin/Chart.lock similarity index 100% rename from deploy/charts/admin/Chart.lock rename to manifests/charts/admin/Chart.lock diff --git a/deploy/charts/admin/Chart.yaml b/manifests/charts/admin/Chart.yaml similarity index 100% rename from deploy/charts/admin/Chart.yaml rename to manifests/charts/admin/Chart.yaml diff --git a/deploy/charts/admin/README.md b/manifests/charts/admin/README.md similarity index 100% rename from deploy/charts/admin/README.md rename to manifests/charts/admin/README.md diff --git a/deploy/charts/admin/README.md.gotmpl b/manifests/charts/admin/README.md.gotmpl similarity index 100% rename from deploy/charts/admin/README.md.gotmpl rename to manifests/charts/admin/README.md.gotmpl diff --git a/deploy/charts/admin/changelog/helm-chart.md.gotmpl b/manifests/charts/admin/changelog/helm-chart.md.gotmpl similarity index 100% rename from deploy/charts/admin/changelog/helm-chart.md.gotmpl rename to manifests/charts/admin/changelog/helm-chart.md.gotmpl diff --git a/deploy/charts/admin/crds/dubbo.io_conditionroutes.yaml b/manifests/charts/admin/crds/dubbo.io_conditionroutes.yaml similarity index 100% rename from deploy/charts/admin/crds/dubbo.io_conditionroutes.yaml rename to manifests/charts/admin/crds/dubbo.io_conditionroutes.yaml diff --git a/deploy/charts/admin/crds/dubbo.io_dataplaneinsights.yaml b/manifests/charts/admin/crds/dubbo.io_dataplaneinsights.yaml similarity index 100% rename from deploy/charts/admin/crds/dubbo.io_dataplaneinsights.yaml rename to manifests/charts/admin/crds/dubbo.io_dataplaneinsights.yaml diff --git a/deploy/charts/admin/crds/dubbo.io_dataplanes.yaml b/manifests/charts/admin/crds/dubbo.io_dataplanes.yaml similarity index 100% rename from deploy/charts/admin/crds/dubbo.io_dataplanes.yaml rename to manifests/charts/admin/crds/dubbo.io_dataplanes.yaml diff --git a/deploy/charts/admin/crds/dubbo.io_datasources.yaml b/manifests/charts/admin/crds/dubbo.io_datasources.yaml similarity index 100% rename from deploy/charts/admin/crds/dubbo.io_datasources.yaml rename to manifests/charts/admin/crds/dubbo.io_datasources.yaml diff --git a/deploy/charts/admin/crds/dubbo.io_dynamicconfigs.yaml b/manifests/charts/admin/crds/dubbo.io_dynamicconfigs.yaml similarity index 100% rename from deploy/charts/admin/crds/dubbo.io_dynamicconfigs.yaml rename to manifests/charts/admin/crds/dubbo.io_dynamicconfigs.yaml diff --git a/deploy/charts/admin/crds/dubbo.io_mappings.yaml b/manifests/charts/admin/crds/dubbo.io_mappings.yaml similarity index 100% rename from deploy/charts/admin/crds/dubbo.io_mappings.yaml rename to manifests/charts/admin/crds/dubbo.io_mappings.yaml diff --git a/deploy/charts/admin/crds/dubbo.io_meshes.yaml b/manifests/charts/admin/crds/dubbo.io_meshes.yaml similarity index 100% rename from deploy/charts/admin/crds/dubbo.io_meshes.yaml rename to manifests/charts/admin/crds/dubbo.io_meshes.yaml diff --git a/deploy/charts/admin/crds/dubbo.io_meshinsights.yaml b/manifests/charts/admin/crds/dubbo.io_meshinsights.yaml similarity index 100% rename from deploy/charts/admin/crds/dubbo.io_meshinsights.yaml rename to manifests/charts/admin/crds/dubbo.io_meshinsights.yaml diff --git a/deploy/charts/admin/crds/dubbo.io_metadata.yaml b/manifests/charts/admin/crds/dubbo.io_metadata.yaml similarity index 100% rename from deploy/charts/admin/crds/dubbo.io_metadata.yaml rename to manifests/charts/admin/crds/dubbo.io_metadata.yaml diff --git a/deploy/charts/admin/crds/dubbo.io_secrets.yaml b/manifests/charts/admin/crds/dubbo.io_secrets.yaml similarity index 100% rename from deploy/charts/admin/crds/dubbo.io_secrets.yaml rename to manifests/charts/admin/crds/dubbo.io_secrets.yaml diff --git a/deploy/charts/admin/crds/dubbo.io_servicenamemappings.yaml b/manifests/charts/admin/crds/dubbo.io_servicenamemappings.yaml similarity index 100% rename from deploy/charts/admin/crds/dubbo.io_servicenamemappings.yaml rename to manifests/charts/admin/crds/dubbo.io_servicenamemappings.yaml diff --git a/deploy/charts/admin/crds/dubbo.io_tagroutes.yaml b/manifests/charts/admin/crds/dubbo.io_tagroutes.yaml similarity index 100% rename from deploy/charts/admin/crds/dubbo.io_tagroutes.yaml rename to manifests/charts/admin/crds/dubbo.io_tagroutes.yaml diff --git a/deploy/charts/admin/crds/dubbo.io_zoneegresses.yaml b/manifests/charts/admin/crds/dubbo.io_zoneegresses.yaml similarity index 100% rename from deploy/charts/admin/crds/dubbo.io_zoneegresses.yaml rename to manifests/charts/admin/crds/dubbo.io_zoneegresses.yaml diff --git a/deploy/charts/admin/crds/dubbo.io_zoneegressinsights.yaml b/manifests/charts/admin/crds/dubbo.io_zoneegressinsights.yaml similarity index 100% rename from deploy/charts/admin/crds/dubbo.io_zoneegressinsights.yaml rename to manifests/charts/admin/crds/dubbo.io_zoneegressinsights.yaml diff --git a/deploy/charts/admin/crds/dubbo.io_zoneingresses.yaml b/manifests/charts/admin/crds/dubbo.io_zoneingresses.yaml similarity index 100% rename from deploy/charts/admin/crds/dubbo.io_zoneingresses.yaml rename to manifests/charts/admin/crds/dubbo.io_zoneingresses.yaml diff --git a/deploy/charts/admin/crds/dubbo.io_zoneingressinsights.yaml b/manifests/charts/admin/crds/dubbo.io_zoneingressinsights.yaml similarity index 100% rename from deploy/charts/admin/crds/dubbo.io_zoneingressinsights.yaml rename to manifests/charts/admin/crds/dubbo.io_zoneingressinsights.yaml diff --git a/deploy/charts/admin/crds/dubbo.io_zoneinsights.yaml b/manifests/charts/admin/crds/dubbo.io_zoneinsights.yaml similarity index 100% rename from deploy/charts/admin/crds/dubbo.io_zoneinsights.yaml rename to manifests/charts/admin/crds/dubbo.io_zoneinsights.yaml diff --git a/deploy/charts/admin/crds/dubbo.io_zones.yaml b/manifests/charts/admin/crds/dubbo.io_zones.yaml similarity index 100% rename from deploy/charts/admin/crds/dubbo.io_zones.yaml rename to manifests/charts/admin/crds/dubbo.io_zones.yaml diff --git a/deploy/charts/admin/templates/NOTES.txt b/manifests/charts/admin/templates/NOTES.txt similarity index 100% rename from deploy/charts/admin/templates/NOTES.txt rename to manifests/charts/admin/templates/NOTES.txt diff --git a/deploy/charts/admin/templates/admin/admin-cert.yaml b/manifests/charts/admin/templates/admin/admin-cert.yaml similarity index 100% rename from deploy/charts/admin/templates/admin/admin-cert.yaml rename to manifests/charts/admin/templates/admin/admin-cert.yaml diff --git a/deploy/charts/admin/templates/admin/admin-cm.yaml b/manifests/charts/admin/templates/admin/admin-cm.yaml similarity index 100% rename from deploy/charts/admin/templates/admin/admin-cm.yaml rename to manifests/charts/admin/templates/admin/admin-cm.yaml diff --git a/deploy/charts/admin/templates/admin/admin-dep.yaml b/manifests/charts/admin/templates/admin/admin-dep.yaml similarity index 100% rename from deploy/charts/admin/templates/admin/admin-dep.yaml rename to manifests/charts/admin/templates/admin/admin-dep.yaml diff --git a/deploy/charts/admin/templates/admin/admin-np.yaml b/manifests/charts/admin/templates/admin/admin-np.yaml similarity index 100% rename from deploy/charts/admin/templates/admin/admin-np.yaml rename to manifests/charts/admin/templates/admin/admin-np.yaml diff --git a/deploy/charts/admin/templates/admin/admin-ns.yaml b/manifests/charts/admin/templates/admin/admin-ns.yaml similarity index 100% rename from deploy/charts/admin/templates/admin/admin-ns.yaml rename to manifests/charts/admin/templates/admin/admin-ns.yaml diff --git a/deploy/charts/admin/templates/admin/admin-pdb.yaml b/manifests/charts/admin/templates/admin/admin-pdb.yaml similarity index 100% rename from deploy/charts/admin/templates/admin/admin-pdb.yaml rename to manifests/charts/admin/templates/admin/admin-pdb.yaml diff --git a/deploy/charts/admin/templates/admin/admin-psp.yaml b/manifests/charts/admin/templates/admin/admin-psp.yaml similarity index 100% rename from deploy/charts/admin/templates/admin/admin-psp.yaml rename to manifests/charts/admin/templates/admin/admin-psp.yaml diff --git a/deploy/charts/admin/templates/admin/admin-pvc.yaml b/manifests/charts/admin/templates/admin/admin-pvc.yaml similarity index 100% rename from deploy/charts/admin/templates/admin/admin-pvc.yaml rename to manifests/charts/admin/templates/admin/admin-pvc.yaml diff --git a/deploy/charts/admin/templates/admin/admin-rbac.yaml b/manifests/charts/admin/templates/admin/admin-rbac.yaml similarity index 100% rename from deploy/charts/admin/templates/admin/admin-rbac.yaml rename to manifests/charts/admin/templates/admin/admin-rbac.yaml diff --git a/deploy/charts/admin/templates/admin/admin-sts.yaml b/manifests/charts/admin/templates/admin/admin-sts.yaml similarity index 100% rename from deploy/charts/admin/templates/admin/admin-sts.yaml rename to manifests/charts/admin/templates/admin/admin-sts.yaml diff --git a/deploy/charts/admin/templates/admin/admin-svc.yaml b/manifests/charts/admin/templates/admin/admin-svc.yaml similarity index 100% rename from deploy/charts/admin/templates/admin/admin-svc.yaml rename to manifests/charts/admin/templates/admin/admin-svc.yaml diff --git a/deploy/charts/admin/templates/custom/_apiversions.tpl b/manifests/charts/admin/templates/custom/_apiversions.tpl similarity index 100% rename from deploy/charts/admin/templates/custom/_apiversions.tpl rename to manifests/charts/admin/templates/custom/_apiversions.tpl diff --git a/deploy/charts/admin/templates/custom/_extras.tpl b/manifests/charts/admin/templates/custom/_extras.tpl similarity index 100% rename from deploy/charts/admin/templates/custom/_extras.tpl rename to manifests/charts/admin/templates/custom/_extras.tpl diff --git a/deploy/charts/admin/templates/custom/_ingresses.tpl b/manifests/charts/admin/templates/custom/_ingresses.tpl similarity index 100% rename from deploy/charts/admin/templates/custom/_ingresses.tpl rename to manifests/charts/admin/templates/custom/_ingresses.tpl diff --git a/deploy/charts/admin/templates/custom/_labels.tpl b/manifests/charts/admin/templates/custom/_labels.tpl similarity index 100% rename from deploy/charts/admin/templates/custom/_labels.tpl rename to manifests/charts/admin/templates/custom/_labels.tpl diff --git a/deploy/charts/admin/templates/custom/_matches.tpl b/manifests/charts/admin/templates/custom/_matches.tpl similarity index 100% rename from deploy/charts/admin/templates/custom/_matches.tpl rename to manifests/charts/admin/templates/custom/_matches.tpl diff --git a/deploy/charts/admin/templates/custom/_names.tpl b/manifests/charts/admin/templates/custom/_names.tpl similarity index 100% rename from deploy/charts/admin/templates/custom/_names.tpl rename to manifests/charts/admin/templates/custom/_names.tpl diff --git a/deploy/charts/admin/templates/custom/_namespaces.tpl b/manifests/charts/admin/templates/custom/_namespaces.tpl similarity index 100% rename from deploy/charts/admin/templates/custom/_namespaces.tpl rename to manifests/charts/admin/templates/custom/_namespaces.tpl diff --git a/deploy/charts/admin/templates/custom/_selectors.tpl b/manifests/charts/admin/templates/custom/_selectors.tpl similarity index 100% rename from deploy/charts/admin/templates/custom/_selectors.tpl rename to manifests/charts/admin/templates/custom/_selectors.tpl diff --git a/deploy/charts/admin/templates/custom/_services.tpl b/manifests/charts/admin/templates/custom/_services.tpl similarity index 100% rename from deploy/charts/admin/templates/custom/_services.tpl rename to manifests/charts/admin/templates/custom/_services.tpl diff --git a/deploy/charts/admin/templates/custom/jobs/jobs-crds-scripts.yaml b/manifests/charts/admin/templates/custom/jobs/jobs-crds-scripts.yaml similarity index 100% rename from deploy/charts/admin/templates/custom/jobs/jobs-crds-scripts.yaml rename to manifests/charts/admin/templates/custom/jobs/jobs-crds-scripts.yaml diff --git a/deploy/charts/admin/templates/custom/jobs/jobs-crds.yaml b/manifests/charts/admin/templates/custom/jobs/jobs-crds.yaml similarity index 100% rename from deploy/charts/admin/templates/custom/jobs/jobs-crds.yaml rename to manifests/charts/admin/templates/custom/jobs/jobs-crds.yaml diff --git a/deploy/charts/admin/templates/exposer/ingress/ingress-class.yaml b/manifests/charts/admin/templates/exposer/ingress/ingress-class.yaml similarity index 100% rename from deploy/charts/admin/templates/exposer/ingress/ingress-class.yaml rename to manifests/charts/admin/templates/exposer/ingress/ingress-class.yaml diff --git a/deploy/charts/admin/templates/exposer/ingress/ingress-dep.yaml b/manifests/charts/admin/templates/exposer/ingress/ingress-dep.yaml similarity index 100% rename from deploy/charts/admin/templates/exposer/ingress/ingress-dep.yaml rename to manifests/charts/admin/templates/exposer/ingress/ingress-dep.yaml diff --git a/deploy/charts/admin/templates/exposer/ingress/ingress-rbac.yaml b/manifests/charts/admin/templates/exposer/ingress/ingress-rbac.yaml similarity index 100% rename from deploy/charts/admin/templates/exposer/ingress/ingress-rbac.yaml rename to manifests/charts/admin/templates/exposer/ingress/ingress-rbac.yaml diff --git a/deploy/charts/admin/templates/exposer/ingress/ingress.yaml b/manifests/charts/admin/templates/exposer/ingress/ingress.yaml similarity index 100% rename from deploy/charts/admin/templates/exposer/ingress/ingress.yaml rename to manifests/charts/admin/templates/exposer/ingress/ingress.yaml diff --git a/deploy/charts/admin/templates/register/nacos/nacos-cm.yaml b/manifests/charts/admin/templates/register/nacos/nacos-cm.yaml similarity index 100% rename from deploy/charts/admin/templates/register/nacos/nacos-cm.yaml rename to manifests/charts/admin/templates/register/nacos/nacos-cm.yaml diff --git a/deploy/charts/admin/templates/register/nacos/nacos-sts.yaml b/manifests/charts/admin/templates/register/nacos/nacos-sts.yaml similarity index 100% rename from deploy/charts/admin/templates/register/nacos/nacos-sts.yaml rename to manifests/charts/admin/templates/register/nacos/nacos-sts.yaml diff --git a/deploy/charts/admin/templates/register/nacos/nacos-svc.yaml b/manifests/charts/admin/templates/register/nacos/nacos-svc.yaml similarity index 100% rename from deploy/charts/admin/templates/register/nacos/nacos-svc.yaml rename to manifests/charts/admin/templates/register/nacos/nacos-svc.yaml diff --git a/deploy/charts/admin/templates/register/zk/zk-cm.yaml b/manifests/charts/admin/templates/register/zk/zk-cm.yaml similarity index 100% rename from deploy/charts/admin/templates/register/zk/zk-cm.yaml rename to manifests/charts/admin/templates/register/zk/zk-cm.yaml diff --git a/deploy/charts/admin/templates/register/zk/zk-sts.yaml b/manifests/charts/admin/templates/register/zk/zk-sts.yaml similarity index 100% rename from deploy/charts/admin/templates/register/zk/zk-sts.yaml rename to manifests/charts/admin/templates/register/zk/zk-sts.yaml diff --git a/deploy/charts/admin/templates/register/zk/zk-svc.yaml b/manifests/charts/admin/templates/register/zk/zk-svc.yaml similarity index 100% rename from deploy/charts/admin/templates/register/zk/zk-svc.yaml rename to manifests/charts/admin/templates/register/zk/zk-svc.yaml diff --git a/deploy/charts/admin/templates/traffic/traffic-authority.yaml b/manifests/charts/admin/templates/traffic/traffic-authority.yaml similarity index 100% rename from deploy/charts/admin/templates/traffic/traffic-authority.yaml rename to manifests/charts/admin/templates/traffic/traffic-authority.yaml diff --git a/deploy/charts/admin/templates/traffic/traffic-rules.yaml b/manifests/charts/admin/templates/traffic/traffic-rules.yaml similarity index 100% rename from deploy/charts/admin/templates/traffic/traffic-rules.yaml rename to manifests/charts/admin/templates/traffic/traffic-rules.yaml diff --git a/deploy/charts/admin/values.schema.json b/manifests/charts/admin/values.schema.json similarity index 100% rename from deploy/charts/admin/values.schema.json rename to manifests/charts/admin/values.schema.json diff --git a/deploy/charts/admin/values.yaml b/manifests/charts/admin/values.yaml similarity index 100% rename from deploy/charts/admin/values.yaml rename to manifests/charts/admin/values.yaml diff --git a/deploy/charts/nacos/.helmignore b/manifests/charts/nacos/.helmignore similarity index 100% rename from deploy/charts/nacos/.helmignore rename to manifests/charts/nacos/.helmignore diff --git a/deploy/charts/nacos/Chart.yaml b/manifests/charts/nacos/Chart.yaml similarity index 100% rename from deploy/charts/nacos/Chart.yaml rename to manifests/charts/nacos/Chart.yaml diff --git a/deploy/charts/nacos/templates/NOTES.txt b/manifests/charts/nacos/templates/NOTES.txt similarity index 100% rename from deploy/charts/nacos/templates/NOTES.txt rename to manifests/charts/nacos/templates/NOTES.txt diff --git a/deploy/charts/nacos/templates/_charts.tpl b/manifests/charts/nacos/templates/_charts.tpl similarity index 100% rename from deploy/charts/nacos/templates/_charts.tpl rename to manifests/charts/nacos/templates/_charts.tpl diff --git a/deploy/charts/nacos/templates/configmap.yaml b/manifests/charts/nacos/templates/configmap.yaml similarity index 100% rename from deploy/charts/nacos/templates/configmap.yaml rename to manifests/charts/nacos/templates/configmap.yaml diff --git a/deploy/charts/nacos/templates/extra-list.yaml b/manifests/charts/nacos/templates/extra-list.yaml similarity index 100% rename from deploy/charts/nacos/templates/extra-list.yaml rename to manifests/charts/nacos/templates/extra-list.yaml diff --git a/deploy/charts/nacos/templates/networkpolicy.yaml b/manifests/charts/nacos/templates/networkpolicy.yaml similarity index 100% rename from deploy/charts/nacos/templates/networkpolicy.yaml rename to manifests/charts/nacos/templates/networkpolicy.yaml diff --git a/deploy/charts/nacos/templates/pdb.yaml b/manifests/charts/nacos/templates/pdb.yaml similarity index 100% rename from deploy/charts/nacos/templates/pdb.yaml rename to manifests/charts/nacos/templates/pdb.yaml diff --git a/deploy/charts/nacos/templates/statefulset.yaml b/manifests/charts/nacos/templates/statefulset.yaml similarity index 100% rename from deploy/charts/nacos/templates/statefulset.yaml rename to manifests/charts/nacos/templates/statefulset.yaml diff --git a/deploy/charts/nacos/templates/svc-headless.yaml b/manifests/charts/nacos/templates/svc-headless.yaml similarity index 100% rename from deploy/charts/nacos/templates/svc-headless.yaml rename to manifests/charts/nacos/templates/svc-headless.yaml diff --git a/deploy/charts/nacos/templates/svc.yaml b/manifests/charts/nacos/templates/svc.yaml similarity index 100% rename from deploy/charts/nacos/templates/svc.yaml rename to manifests/charts/nacos/templates/svc.yaml diff --git a/deploy/charts/nacos/values.yaml b/manifests/charts/nacos/values.yaml similarity index 100% rename from deploy/charts/nacos/values.yaml rename to manifests/charts/nacos/values.yaml diff --git a/deploy/embedded.go b/manifests/embedded.go similarity index 98% rename from deploy/embedded.go rename to manifests/embedded.go index a9cb4d4e9..7205f49f5 100644 --- a/deploy/embedded.go +++ b/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 b/manifests/example/admin.yaml similarity index 100% rename from deploy/example/admin.yaml rename to manifests/example/admin.yaml diff --git a/deploy/example/grafana.yaml b/manifests/example/grafana.yaml similarity index 100% rename from deploy/example/grafana.yaml rename to manifests/example/grafana.yaml diff --git a/deploy/example/prometheus.yaml b/manifests/example/prometheus.yaml similarity index 100% rename from deploy/example/prometheus.yaml rename to manifests/example/prometheus.yaml diff --git a/deploy/example/skywalking.yaml b/manifests/example/skywalking.yaml similarity index 100% rename from deploy/example/skywalking.yaml rename to manifests/example/skywalking.yaml diff --git a/deploy/example/zipkin.yaml b/manifests/example/zipkin.yaml similarity index 100% rename from deploy/example/zipkin.yaml rename to manifests/example/zipkin.yaml diff --git a/deploy/example/zookeeper.yaml b/manifests/example/zookeeper.yaml similarity index 100% rename from deploy/example/zookeeper.yaml rename to manifests/example/zookeeper.yaml diff --git a/deploy/horus/horus.yaml b/manifests/horus/horus.yaml similarity index 100% rename from deploy/horus/horus.yaml rename to manifests/horus/horus.yaml diff --git a/deploy/profiles/default.yaml b/manifests/profiles/default.yaml similarity index 100% rename from deploy/profiles/default.yaml rename to manifests/profiles/default.yaml diff --git a/deploy/profiles/demo.yaml b/manifests/profiles/demo.yaml similarity index 100% rename from deploy/profiles/demo.yaml rename to manifests/profiles/demo.yaml diff --git a/tests/dp/dp.Dockerfile b/tests/dp/dp.Dockerfile index 60b4c5a99..dc62c33f3 100644 --- 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