You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by li...@apache.org on 2023/05/12 03:16:11 UTC
[dubbo-admin] 03/04: Merge branch 'refactor-with-go' into refactor-with-go-package
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 beb77d646f236caba4ba71d6e162b5c7d692642c
Merge: 3b3642b1 d1b21a26
Author: chickenlj <ke...@gmail.com>
AuthorDate: Thu May 11 13:47:52 2023 +0800
Merge branch 'refactor-with-go' into refactor-with-go-package
# Conflicts:
# go.mod
# go.sum
Dockerfile | 9 +-
Makefile | 28 +-
cmd/authority/app/authority.go | 9 +-
deploy/charts/dubbo-admin/README.md | 22 +
deploy/charts/dubbo-admin/templates/_charts.tpl | 4 +-
deploy/charts/dubbo-admin/templates/configmap.yaml | 104 +++
.../charts/dubbo-admin/templates/deployment.yaml | 4 +-
deploy/charts/dubbo-admin/values.yaml | 256 ++++---
deploy/charts/nacos/README.md | 93 +++
deploy/charts/nacos/templates/NOTES.txt | 0
deploy/charts/nacos/templates/_charts.tpl | 20 +-
deploy/charts/nacos/templates/configmap.yaml | 2 -
.../templates/extra-list.yaml} | 17 +-
deploy/charts/nacos/templates/statefulset.yaml | 19 +-
deploy/charts/nacos/templates/svc-headless.yaml | 2 -
deploy/charts/nacos/templates/svc.yaml | 2 -
deploy/charts/nacos/values.yaml | 44 +-
go.mod | 79 +-
go.sum | 752 +++----------------
pkg/admin/config/config.go | 4 +-
pkg/admin/services/provider_service_impl.go | 2 +-
pkg/dubboctl/cmd/manifest.go | 2 +
pkg/dubboctl/cmd/manifest_test.go | 84 ++-
.../dubboctl/cmd/testdata/diff/profileA.yaml | 21 +-
.../dubboctl/cmd/testdata/diff/profileB.yaml | 21 +-
.../apis/dubbo.apache.org/v1alpha1/types.go | 11 +-
pkg/dubboctl/internal/cmd/manifest_diff.go | 174 +++++
.../cmd/{manifest.go => manifest_generate.go} | 3 +-
.../cmd/{install.go => manifest_install.go} | 2 +-
.../cmd/{install.go => manifest_uninstall.go} | 42 +-
pkg/dubboctl/internal/kube/client.go | 80 ++
pkg/dubboctl/internal/kube/client_test.go | 179 ++++-
pkg/dubboctl/internal/kube/object.go | 131 +++-
pkg/dubboctl/internal/kube/object_test.go | 139 ++++
.../input/ctl_client-remove_manifest-before.yaml | 23 +-
.../testdata/input/ctl_client-remove_manifest.yaml | 23 +-
.../ctl_client-remove_object-delete-before.yaml | 14 +-
.../input/ctl_client-remove_object-delete.yaml | 14 +-
pkg/dubboctl/internal/operator/component.go | 34 +
pkg/dubboctl/internal/operator/operator.go | 18 +
.../admin_component-render_manifest.golden.yaml | 183 ++---
.../grafana_component-render_manifest.golden.yaml | 242 +++---
.../nacos_component-render_manifest.golden.yaml | 107 +--
...rometheus_component-render_manifest.golden.yaml | 831 ++++++++++++---------
...kywalking_component-render_manifest.golden.yaml | 459 ++++++------
.../zipkin_component-render_manifest.golden.yaml | 64 +-
...zookeeper_component-render_manifest.golden.yaml | 191 ++---
pkg/dubboctl/internal/util/filter_test.go | 23 +
pkg/dubboctl/internal/util/yaml.go | 89 +++
pkg/dubboctl/internal/util/yaml_test.go | 197 +++++
pkg/logger/log.go | 21 +-
pkg/logger/log_wrapper.go | 109 +++
52 files changed, 3048 insertions(+), 1955 deletions(-)