This is an automated email from the ASF dual-hosted git repository.

liujun pushed a commit to branch refactor-with-go-package
in repository https://gitbox.apache.org/repos/asf/dubbo-admin.git

commit 114bdecd6b7430bde8be3c31d9acd0ff54a8dcac
Merge: a69ced26 962b95d8
Author: chickenlj <[email protected]>
AuthorDate: Mon Apr 17 13:34:06 2023 +0800

    Merge branch 'refactor-with-go' of https://github.com/apache/dubbo-admin 
into refactor-with-go

 cmd/dubboctl/main.go                               |   28 +
 deploy/addons/env.sh                               |   26 +-
 deploy/charts/dubbo-admin/templates/_charts.tpl    |    4 +-
 .../charts/dubbo-admin/templates/clusterrole.yaml  |    2 +
 .../dubbo-admin/templates/clusterrolebinding.yaml  |    2 +
 .../charts/dubbo-admin/templates/deployment.yaml   |    5 +-
 deploy/charts/dubbo-admin/templates/role.yaml      |    4 +-
 .../charts/dubbo-admin/templates/rolebinding.yaml  |    2 +
 .../dubbo-admin/templates/serviceaccount.yaml      |    4 +-
 .../dubbo-admin/templates/tests/test-role.yaml     |   36 -
 .../templates/tests/test-rolebinding.yaml          |   35 -
 .../dubbo-admin/templates/tests/test-secret.yaml   |   28 -
 .../templates/tests/test-serviceaccount.yaml       |   27 -
 .../charts/dubbo-admin/templates/tests/test.yaml   |   64 --
 deploy/charts/nacos/templates/statefulset.yaml     |    6 +-
 deploy/charts/nacos/values.yaml                    |    2 +-
 .../dubbo-admin.yaml}                              |  573 ++++------
 deploy/kubernetes/dubbo-admin/configmap.yaml       |   69 --
 deploy/kubernetes/dubbo-admin/deployment.yaml      |   74 --
 deploy/kubernetes/dubbo-admin/rbac.yaml            |   63 -
 .../{addons/manifests => kubernetes}/grafana.yaml  |   15 +
 deploy/kubernetes/grafana/configmap.yaml           |   37 -
 deploy/kubernetes/grafana/rbac.yaml                |   78 --
 deploy/kubernetes/grafana/secret.yaml              |   27 -
 deploy/kubernetes/grafana/statefulset.yaml         |  108 --
 deploy/kubernetes/grafana/storage.yaml             |   34 -
 deploy/kubernetes/nacos/pv.yaml                    |   37 -
 deploy/kubernetes/nacos/pvc.yaml                   |   26 -
 deploy/kubernetes/nacos/service.yaml               |   36 -
 .../manifests => kubernetes}/prometheus.yaml       |   15 +
 deploy/kubernetes/prometheus/configmap.yaml        |   29 -
 deploy/kubernetes/prometheus/pv.yaml               |   37 -
 deploy/kubernetes/prometheus/pvc.yaml              |   26 -
 deploy/kubernetes/prometheus/rbac.yaml             |   68 --
 deploy/kubernetes/prometheus/service.yaml          |   28 -
 deploy/kubernetes/prometheus/statefulset.yaml      |   64 --
 .../manifests => kubernetes}/skywalking.yaml       |    0
 .../{addons/manifests => kubernetes}/zipkin.yaml   |   15 +
 .../manifests => kubernetes}/zookeeper.yaml        |   15 +
 deploy/kubernetes/zookeeper/configmap.yaml         |   40 -
 deploy/kubernetes/zookeeper/pv.yaml                |   37 -
 deploy/kubernetes/zookeeper/pvc.yaml               |   26 -
 deploy/kubernetes/zookeeper/statefulset.yaml       |  100 --
 .../dubbo-admin/pv.yaml => profiles/default.yaml}  |   50 +-
 go.mod                                             |  104 +-
 go.sum                                             |  393 ++++++-
 pkg/admin/services/prometheus_service_impl_test.go |    9 +
 pkg/dubboctl/cmd/manifest.go                       |   32 +
 pkg/dubboctl/cmd/manifest_test.go                  |  105 ++
 pkg/dubboctl/cmd/root.go                           |   43 +
 .../dubboctl/cmd/testdata/customization/user.yaml  |   12 +-
 pkg/dubboctl/identifier/constant.go                |   20 +
 pkg/dubboctl/identifier/env.go                     |   34 +
 .../apis/dubbo.apache.org/v1alpha1/types.go        |  444 ++++++++
 pkg/dubboctl/internal/cmd/common.go                |   24 +
 pkg/dubboctl/internal/cmd/install.go               |   98 ++
 pkg/dubboctl/internal/cmd/manifest.go              |  223 ++++
 pkg/dubboctl/internal/kube/client.go               |  189 +++
 pkg/dubboctl/internal/kube/client_test.go          |  161 +++
 pkg/dubboctl/internal/kube/common.go               |  144 +++
 pkg/dubboctl/internal/kube/common_test.go          |  109 ++
 pkg/dubboctl/internal/kube/object.go               |  146 +++
 pkg/dubboctl/internal/kube/object_test.go          |  157 +++
 .../testdata/input/ctl_client-apply_manifest.yaml  |   23 +-
 .../input/ctl_client-apply_object-create.yaml      |   11 +-
 .../ctl_client-apply_object-update-before.yaml     |   11 +-
 .../input/ctl_client-apply_object-update.yaml      |   12 +-
 .../want/ctl_client-apply_object-create.yaml       |   12 +-
 .../want/ctl_client-apply_object-update.yaml       |   12 +-
 pkg/dubboctl/internal/manifest/common.go           |   97 ++
 pkg/dubboctl/internal/manifest/common_test.go      |   85 ++
 pkg/dubboctl/internal/manifest/render/render.go    |  420 +++++++
 .../internal/manifest/render/render_test.go        |  908 +++++++++++++++
 .../internal/manifest/render/testchart/.helmignore |   23 +
 .../internal/manifest/render/testchart/Chart.yaml  |   39 +
 .../manifest/render/testchart/templates/NOTES.txt  |   22 +
 .../render/testchart/templates/_helpers.tpl        |   62 +
 .../render/testchart/templates/deployment.yaml     |   76 ++
 .../manifest/render/testchart/templates/hpa.yaml   |   43 +
 .../render/testchart/templates/ingress.yaml        |   76 ++
 .../render/testchart/templates}/service.yaml       |   13 +-
 .../render/testchart/templates/serviceaccount.yaml |   22 +-
 .../testchart/templates/tests/test-connection.yaml |   27 +-
 .../internal/manifest/render/testchart/values.yaml |   97 ++
 pkg/dubboctl/internal/manifest/tree.go             |  564 +++++++++
 pkg/dubboctl/internal/manifest/util.go             |   62 +
 pkg/dubboctl/internal/operator/component.go        |  598 ++++++++++
 pkg/dubboctl/internal/operator/component_test.go   |  187 +++
 pkg/dubboctl/internal/operator/operator.go         |  174 +++
 .../admin_component-render_manifest.golden.yaml    |  269 +++++
 .../grafana_component-render_manifest.golden.yaml  |  131 ++-
 .../nacos_component-render_manifest.golden.yaml    |   63 +-
 ...rometheus_component-render_manifest.golden.yaml | 1199 ++++++++++++++++++++
 ...kywalking_component-render_manifest.golden.yaml |  478 ++++++++
 .../zipkin_component-render_manifest.golden.yaml   |   87 +-
 ...zookeeper_component-render_manifest.golden.yaml |  160 +--
 pkg/dubboctl/internal/util/filter.go               |   92 ++
 pkg/dubboctl/internal/util/filter_test.go          |   99 ++
 pkg/dubboctl/internal/util/golden.go               |  189 +++
 pkg/dubboctl/internal/util/golden_test.go          |  212 ++++
 pkg/dubboctl/internal/util/path.go                 |  211 ++++
 pkg/dubboctl/internal/util/reflect.go              |  182 +++
 pkg/dubboctl/internal/util/yaml.go                 |   87 ++
 pkg/logger/log.go                                  |   54 +-
 104 files changed, 9704 insertions(+), 1934 deletions(-)

Reply via email to