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/07/18 04:09:42 UTC
[dubbo-admin] branch refactor-with-go-components-experimental updated (0e4d4506 -> c92861dd)
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a change to branch refactor-with-go-components-experimental
in repository https://gitbox.apache.org/repos/asf/dubbo-admin.git
from 0e4d4506 simple refactoring (#1199)
add 6cb71a0b update ui pages
add e498d36d update ui pages (#1179)
add 419be4e1 Merge branch 'refactor-with-go' of https://github.com/apache/dubbo-admin into refactor-with-go
add 51445ddf Update traffic pages (#1186)
new 032c95fc Merge branch 'refactor-with-go' of https://github.com/apache/dubbo-admin into refactor-with-go
add dbea01aa Optimize controller templates and missing values (#1180)
add ae08d9cc Bump ansi-regex from 3.0.0 to 3.0.1 in /dubbo-admin-ui (#1153)
new de5b66df Merge branch 'refactor-with-go' of https://github.com/apache/dubbo-admin into refactor-with-go
add cf1c91b2 Add Configuration README (#1192)
add 9e25208e fix: fix some issues (#1193)
new 8af8682e Merge branch 'refactor-with-go' of https://github.com/apache/dubbo-admin into refactor-with-go
add f4b37199 Implement dubboctl dashboard subcmd (#1197)
add 0d0ec467 modify default profile and provide demo profile (#1198)
add 0d2f3e59 Modify some descriptions to fit in dubboctl user doc (#1200)
new 7825a933 Merge branch 'refactor-with-go' of https://github.com/apache/dubbo-admin into refactor-with-go
new c92861dd Merge branch 'refactor-with-go' into refactor-with-go-components-experimental
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
app/dubbo-ui/dist/index.html | 2 +-
.../css/{app.4de6ac6b.css => app.be67f7a9.css} | 2 +-
app/dubbo-ui/dist/static/js/app.29227e12.js | 2 -
app/dubbo-ui/dist/static/js/app.29227e12.js.map | 1 -
app/dubbo-ui/dist/static/js/app.97288c91.js | 2 +
app/dubbo-ui/dist/static/js/app.97288c91.js.map | 1 +
app/dubboctl/cmd/profile.go | 4 +-
app/dubboctl/cmd/profile_test.go | 5 +-
app/dubboctl/cmd/root.go | 1 +
app/dubboctl/cmd/subcmd/manifest_generate.go | 12 +-
app/dubboctl/cmd/subcmd/manifest_install.go | 2 +-
app/dubboctl/cmd/subcmd/manifest_uninstall.go | 2 +-
app/dubboctl/cmd/subcmd/profile_diff.go | 4 +-
app/dubboctl/cmd/subcmd/profile_list.go | 4 +-
app/dubboctl/cmd/testdata/customization/user.yaml | 2 +-
app/dubboctl/cmd/testdata/diff/profileA.yaml | 2 +-
app/dubboctl/cmd/testdata/diff/profileB.yaml | 2 +-
app/dubboctl/cmd/testdata/profile/test0.yaml | 2 +-
app/dubboctl/cmd/testdata/profile/test1.yaml | 2 +-
.../cmd/testdata/profile/test2_wrong_format.yaml | 2 +-
app/dubboctl/internal/kube/client.go | 2 +-
app/dubboctl/internal/kube/common.go | 33 +-
deploy/charts/dubbo-admin/README.md | 21 +-
.../charts/dubbo-admin/templates/deployment.yaml | 62 +-
deploy/charts/dubbo-admin/values.yaml | 10 +
deploy/profiles/default.yaml | 22 +-
deploy/profiles/{default.yaml => demo.yaml} | 4 +-
dubbo-admin-ui/src/api/menu.js | 6 +-
dubbo-admin-ui/src/components/ServiceDetail.vue | 2 +-
dubbo-admin-ui/src/components/apiDocs/ApiForm.vue | 1 +
.../src/components/governance/AccessControl.vue | 625 ---------------------
.../src/components/governance/LoadBalance.vue | 605 --------------------
.../src/components/governance/MeshRule.vue | 414 --------------
.../src/components/governance/Overrides.vue | 4 +-
.../src/components/governance/RoutingRule.vue | 4 +-
.../src/components/governance/TagRule.vue | 4 +-
.../src/components/governance/WeightAdjust.vue | 583 -------------------
dubbo-admin-ui/src/components/public/AceEditor.vue | 1 +
.../src/components/public/Breadcrumb.vue | 1 +
dubbo-admin-ui/src/components/public/Drawer.vue | 5 +-
.../src/components/traffic/Accesslog.vue | 123 ++--
.../src/components/traffic/Arguments.vue | 214 ++++---
dubbo-admin-ui/src/components/traffic/Gray.vue | 97 +++-
dubbo-admin-ui/src/components/traffic/Host.vue | 17 +-
.../src/components/traffic/Isolation.vue | 321 -----------
dubbo-admin-ui/src/components/traffic/Mock.vue | 178 +++---
dubbo-admin-ui/src/components/traffic/Region.vue | 171 +++---
dubbo-admin-ui/src/components/traffic/Retry.vue | 202 ++++---
dubbo-admin-ui/src/components/traffic/Timeout.vue | 200 ++++---
dubbo-admin-ui/src/components/traffic/Weight.vue | 233 +++++---
dubbo-admin-ui/src/router/index.js | 59 +-
dubbo-admin-ui/src/util/index.js | 1 +
dubbo-admin-ui/yarn.lock | 23 +-
pkg/admin/model/condition_route.go | 2 +-
pkg/admin/model/match.go | 20 +-
pkg/admin/model/tag_route.go | 6 +-
pkg/admin/model/traffic.go | 12 +-
pkg/admin/services/prometheus_service_impl.go | 2 +-
pkg/admin/services/route_service_impl.go | 9 +-
pkg/admin/services/traffic/accesslog.go | 28 +-
pkg/admin/services/traffic/argument.go | 16 +-
.../services/traffic/generic_rule_operation.go | 11 +-
pkg/admin/services/traffic/gray.go | 16 +-
pkg/admin/services/traffic/mock.go | 19 +-
pkg/admin/services/traffic/region.go | 35 +-
pkg/admin/services/traffic/retry.go | 19 +-
pkg/admin/services/traffic/timeout.go | 21 +-
pkg/admin/services/traffic/weight.go | 18 +-
.../profile.go => pkg/dubboctl/cmd/dashboard.go | 22 +-
pkg/dubboctl/cmd/subcmd/dashboard_all_cmds.go | 229 ++++++++
pkg/dubboctl/internal/kube/port_foward.go | 152 +++++
71 files changed, 1576 insertions(+), 3365 deletions(-)
rename app/dubbo-ui/dist/static/css/{app.4de6ac6b.css => app.be67f7a9.css} (76%)
delete mode 100644 app/dubbo-ui/dist/static/js/app.29227e12.js
delete mode 100644 app/dubbo-ui/dist/static/js/app.29227e12.js.map
create mode 100644 app/dubbo-ui/dist/static/js/app.97288c91.js
create mode 100644 app/dubbo-ui/dist/static/js/app.97288c91.js.map
copy deploy/profiles/{default.yaml => demo.yaml} (96%)
delete mode 100644 dubbo-admin-ui/src/components/governance/AccessControl.vue
delete mode 100644 dubbo-admin-ui/src/components/governance/LoadBalance.vue
delete mode 100644 dubbo-admin-ui/src/components/governance/MeshRule.vue
delete mode 100644 dubbo-admin-ui/src/components/governance/WeightAdjust.vue
delete mode 100644 dubbo-admin-ui/src/components/traffic/Isolation.vue
copy app/dubboctl/cmd/profile.go => pkg/dubboctl/cmd/dashboard.go (54%)
create mode 100644 pkg/dubboctl/cmd/subcmd/dashboard_all_cmds.go
create mode 100644 pkg/dubboctl/internal/kube/port_foward.go
[dubbo-admin] 04/05: Merge branch 'refactor-with-go' of https://github.com/apache/dubbo-admin into refactor-with-go
Posted by li...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch refactor-with-go-components-experimental
in repository https://gitbox.apache.org/repos/asf/dubbo-admin.git
commit 7825a933831ebbaa5c70fc87741ce1a6e9deef7d
Merge: 8af8682e 0d2f3e59
Author: chickenlj <ke...@gmail.com>
AuthorDate: Mon Jul 17 11:44:08 2023 +0800
Merge branch 'refactor-with-go' of https://github.com/apache/dubbo-admin into refactor-with-go
deploy/profiles/default.yaml | 22 +-
deploy/profiles/{default.yaml => demo.yaml} | 4 +-
pkg/dubboctl/cmd/{profile.go => dashboard.go} | 20 +-
pkg/dubboctl/cmd/profile.go | 4 +-
pkg/dubboctl/cmd/profile_test.go | 5 +-
pkg/dubboctl/cmd/root.go | 1 +
pkg/dubboctl/cmd/subcmd/dashboard_all_cmds.go | 229 +++++++++++++++++++++
pkg/dubboctl/cmd/subcmd/manifest_generate.go | 12 +-
pkg/dubboctl/cmd/subcmd/manifest_install.go | 2 +-
pkg/dubboctl/cmd/subcmd/manifest_uninstall.go | 2 +-
pkg/dubboctl/cmd/subcmd/profile_diff.go | 4 +-
pkg/dubboctl/cmd/subcmd/profile_list.go | 4 +-
pkg/dubboctl/cmd/testdata/customization/user.yaml | 2 +-
pkg/dubboctl/cmd/testdata/diff/profileA.yaml | 2 +-
pkg/dubboctl/cmd/testdata/diff/profileB.yaml | 2 +-
pkg/dubboctl/cmd/testdata/profile/test0.yaml | 2 +-
pkg/dubboctl/cmd/testdata/profile/test1.yaml | 2 +-
.../cmd/testdata/profile/test2_wrong_format.yaml | 2 +-
pkg/dubboctl/internal/kube/client.go | 2 +-
pkg/dubboctl/internal/kube/common.go | 33 ++-
pkg/dubboctl/internal/kube/port_foward.go | 152 ++++++++++++++
21 files changed, 452 insertions(+), 56 deletions(-)
[dubbo-admin] 05/05: Merge branch 'refactor-with-go' into refactor-with-go-components-experimental
Posted by li...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch refactor-with-go-components-experimental
in repository https://gitbox.apache.org/repos/asf/dubbo-admin.git
commit c92861dd096b8a0728820d79e7e6dd5071459e66
Merge: 0e4d4506 7825a933
Author: chickenlj <ke...@gmail.com>
AuthorDate: Tue Jul 18 11:55:10 2023 +0800
Merge branch 'refactor-with-go' into refactor-with-go-components-experimental
app/dubbo-ui/dist/index.html | 2 +-
.../css/{app.4de6ac6b.css => app.be67f7a9.css} | 2 +-
app/dubbo-ui/dist/static/js/app.29227e12.js | 2 -
app/dubbo-ui/dist/static/js/app.29227e12.js.map | 1 -
app/dubbo-ui/dist/static/js/app.97288c91.js | 2 +
app/dubbo-ui/dist/static/js/app.97288c91.js.map | 1 +
app/dubboctl/cmd/profile.go | 4 +-
app/dubboctl/cmd/profile_test.go | 5 +-
app/dubboctl/cmd/root.go | 1 +
app/dubboctl/cmd/subcmd/manifest_generate.go | 12 +-
app/dubboctl/cmd/subcmd/manifest_install.go | 2 +-
app/dubboctl/cmd/subcmd/manifest_uninstall.go | 2 +-
app/dubboctl/cmd/subcmd/profile_diff.go | 4 +-
app/dubboctl/cmd/subcmd/profile_list.go | 4 +-
app/dubboctl/cmd/testdata/customization/user.yaml | 2 +-
app/dubboctl/cmd/testdata/diff/profileA.yaml | 2 +-
app/dubboctl/cmd/testdata/diff/profileB.yaml | 2 +-
app/dubboctl/cmd/testdata/profile/test0.yaml | 2 +-
app/dubboctl/cmd/testdata/profile/test1.yaml | 2 +-
.../cmd/testdata/profile/test2_wrong_format.yaml | 2 +-
app/dubboctl/internal/kube/client.go | 2 +-
app/dubboctl/internal/kube/common.go | 33 +-
deploy/charts/dubbo-admin/README.md | 21 +-
.../charts/dubbo-admin/templates/deployment.yaml | 62 +-
deploy/charts/dubbo-admin/values.yaml | 10 +
deploy/profiles/default.yaml | 22 +-
deploy/profiles/{default.yaml => demo.yaml} | 4 +-
dubbo-admin-ui/src/api/menu.js | 6 +-
dubbo-admin-ui/src/components/ServiceDetail.vue | 2 +-
dubbo-admin-ui/src/components/apiDocs/ApiForm.vue | 1 +
.../src/components/governance/AccessControl.vue | 625 ---------------------
.../src/components/governance/LoadBalance.vue | 605 --------------------
.../src/components/governance/MeshRule.vue | 414 --------------
.../src/components/governance/Overrides.vue | 4 +-
.../src/components/governance/RoutingRule.vue | 4 +-
.../src/components/governance/TagRule.vue | 4 +-
.../src/components/governance/WeightAdjust.vue | 583 -------------------
dubbo-admin-ui/src/components/public/AceEditor.vue | 1 +
.../src/components/public/Breadcrumb.vue | 1 +
dubbo-admin-ui/src/components/public/Drawer.vue | 5 +-
.../src/components/traffic/Accesslog.vue | 123 ++--
.../src/components/traffic/Arguments.vue | 214 ++++---
dubbo-admin-ui/src/components/traffic/Gray.vue | 97 +++-
dubbo-admin-ui/src/components/traffic/Host.vue | 17 +-
.../src/components/traffic/Isolation.vue | 321 -----------
dubbo-admin-ui/src/components/traffic/Mock.vue | 178 +++---
dubbo-admin-ui/src/components/traffic/Region.vue | 171 +++---
dubbo-admin-ui/src/components/traffic/Retry.vue | 202 ++++---
dubbo-admin-ui/src/components/traffic/Timeout.vue | 200 ++++---
dubbo-admin-ui/src/components/traffic/Weight.vue | 233 +++++---
dubbo-admin-ui/src/router/index.js | 59 +-
dubbo-admin-ui/src/util/index.js | 1 +
dubbo-admin-ui/yarn.lock | 23 +-
pkg/admin/model/condition_route.go | 2 +-
pkg/admin/model/match.go | 20 +-
pkg/admin/model/tag_route.go | 6 +-
pkg/admin/model/traffic.go | 12 +-
pkg/admin/services/prometheus_service_impl.go | 2 +-
pkg/admin/services/route_service_impl.go | 9 +-
pkg/admin/services/traffic/accesslog.go | 28 +-
pkg/admin/services/traffic/argument.go | 16 +-
.../services/traffic/generic_rule_operation.go | 11 +-
pkg/admin/services/traffic/gray.go | 16 +-
pkg/admin/services/traffic/mock.go | 19 +-
pkg/admin/services/traffic/region.go | 35 +-
pkg/admin/services/traffic/retry.go | 19 +-
pkg/admin/services/traffic/timeout.go | 21 +-
pkg/admin/services/traffic/weight.go | 18 +-
.../profile.go => pkg/dubboctl/cmd/dashboard.go | 22 +-
pkg/dubboctl/cmd/subcmd/dashboard_all_cmds.go | 229 ++++++++
pkg/dubboctl/internal/kube/port_foward.go | 152 +++++
71 files changed, 1576 insertions(+), 3365 deletions(-)
diff --cc app/dubbo-ui/dist/static/js/app.97288c91.js
index 00000000,f6244a9e..f6244a9e
mode 000000,100644..100644
--- a/app/dubbo-ui/dist/static/js/app.97288c91.js
+++ b/app/dubbo-ui/dist/static/js/app.97288c91.js
diff --cc app/dubbo-ui/dist/static/js/app.97288c91.js.map
index 00000000,167f7730..167f7730
mode 000000,100644..100644
--- a/app/dubbo-ui/dist/static/js/app.97288c91.js.map
+++ b/app/dubbo-ui/dist/static/js/app.97288c91.js.map
diff --cc app/dubboctl/internal/kube/client.go
index 9bacf69c,59dbe4db..0490e11f
--- a/app/dubboctl/internal/kube/client.go
+++ b/app/dubboctl/internal/kube/client.go
@@@ -29,10 -29,10 +29,10 @@@ import
"sigs.k8s.io/controller-runtime/pkg/client"
)
-// CtlClient wraps controller-runtime client and is used by dubboctl
+// CtlClient wraps controller-runtime clientgen and is used by dubboctl
type CtlClient struct {
- client.Client
opts *CtlClientOptions
+ client.Client
}
type CtlClientOptions struct {
diff --cc deploy/charts/dubbo-admin/templates/deployment.yaml
index cd462b60,2a0189c7..4581b391
--- a/deploy/charts/dubbo-admin/templates/deployment.yaml
+++ b/deploy/charts/dubbo-admin/templates/deployment.yaml
@@@ -77,36 -79,39 +79,42 @@@ spec
readOnly: true
livenessProbe:
httpGet:
- path: {{ .Values.livenessProbe.httpGet.path }}
- port: {{ .Values.livenessProbe.httpGet.port }}
- initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }}
- timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }}
- periodSeconds: {{ .Values.livenessProbe.periodSeconds }}
- successThreshold: {{ .Values.livenessProbe.successThreshold }}
- failureThreshold: {{ .Values.livenessProbe.failureThreshold }}
+ {{- with .Values.livenessProbe }}
+ path: {{ .httpGet.path }}
+ port: {{ .httpGet.port }}
+ initialDelaySeconds: {{ .initialDelaySeconds }}
+ timeoutSeconds: {{ .timeoutSeconds }}
+ periodSeconds: {{ .periodSeconds }}
+ successThreshold: {{ .successThreshold }}
+ failureThreshold: {{ .failureThreshold }}
readinessProbe:
httpGet:
- path: {{ .Values.livenessProbe.httpGet.path }}
- port: {{ .Values.livenessProbe.httpGet.port }}
- initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }}
- timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }}
- periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
- successThreshold: {{ .Values.readinessProbe.successThreshold }}
- failureThreshold: {{ .Values.readinessProbe.failureThreshold }}
+ path: {{ .httpGet.path }}
+ port: {{ .httpGet.port }}
+ initialDelaySeconds: {{ .initialDelaySeconds }}
+ {{- end }}
+ {{- with .Values.readinessProbe }}
+ timeoutSeconds: {{ .timeoutSeconds }}
+ periodSeconds: {{ .periodSeconds }}
+ successThreshold: {{ .successThreshold }}
+ failureThreshold: {{ .failureThreshold }}
+ {{- end }}
startupProbe:
httpGet:
- path: {{ .Values.startupProbe.httpGet.path }}
- port: {{ .Values.startupProbe.httpGet.port }}
- initialDelaySeconds: {{ .Values.startupProbe.initialDelaySeconds }}
- timeoutSeconds: {{ .Values.startupProbe.timeoutSeconds }}
- periodSeconds: {{ .Values.startupProbe.periodSeconds }}
- successThreshold: {{ .Values.startupProbe.successThreshold }}
- failureThreshold: {{ .Values.startupProbe.failureThreshold }}
+ {{- with .Values.startupProbe }}
+ path: {{ .httpGet.path }}
+ port: {{ .httpGet.port }}
+ initialDelaySeconds: {{ .initialDelaySeconds }}
+ timeoutSeconds: {{ .timeoutSeconds }}
+ periodSeconds: {{ .periodSeconds }}
+ successThreshold: {{ .successThreshold }}
+ failureThreshold: {{ .failureThreshold }}
+ {{- end }}
resources:
{{- toYaml .Values.resources | nindent 12 }}
+ env:
+ - name: ADMIN_CONFIG_PATH
+ value: /config/admin.yml
volumes:
- name: application-properties
configMap:
diff --cc pkg/admin/services/traffic/generic_rule_operation.go
index c40022c5,61f92d17..65a84237
--- a/pkg/admin/services/traffic/generic_rule_operation.go
+++ b/pkg/admin/services/traffic/generic_rule_operation.go
@@@ -20,9 -20,10 +20,10 @@@ package traffi
import (
"github.com/apache/dubbo-admin/pkg/admin/config"
"github.com/apache/dubbo-admin/pkg/admin/model"
- "github.com/apache/dubbo-admin/pkg/logger"
+ "github.com/apache/dubbo-admin/pkg/core/logger"
perrors "github.com/pkg/errors"
"gopkg.in/yaml.v2"
+ "strings"
)
func removeFromOverride(key, side, param string) error {
[dubbo-admin] 03/05: Merge branch 'refactor-with-go' of https://github.com/apache/dubbo-admin into refactor-with-go
Posted by li...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch refactor-with-go-components-experimental
in repository https://gitbox.apache.org/repos/asf/dubbo-admin.git
commit 8af8682e86d9b4d727e30136abba25c3ff77f5e1
Merge: de5b66df 9e25208e
Author: chickenlj <ke...@gmail.com>
AuthorDate: Sat Jul 8 11:35:50 2023 +0800
Merge branch 'refactor-with-go' of https://github.com/apache/dubbo-admin into refactor-with-go
deploy/charts/dubbo-admin/README.md | 21 ++-
dubbo-admin-ui/src/api/menu.js | 6 +-
dubbo-admin-ui/src/components/ServiceDetail.vue | 2 +-
dubbo-admin-ui/src/components/apiDocs/ApiForm.vue | 1 +
dubbo-admin-ui/src/components/public/AceEditor.vue | 1 +
.../src/components/public/Breadcrumb.vue | 1 +
dubbo-admin-ui/src/components/public/Drawer.vue | 5 +-
.../src/components/traffic/Accesslog.vue | 42 ++++--
.../src/components/traffic/Arguments.vue | 116 +++++++-------
dubbo-admin-ui/src/components/traffic/Gray.vue | 54 ++++++-
dubbo-admin-ui/src/components/traffic/Mock.vue | 126 ++++++++--------
dubbo-admin-ui/src/components/traffic/Region.vue | 116 +++++++-------
dubbo-admin-ui/src/components/traffic/Retry.vue | 110 +++++++-------
dubbo-admin-ui/src/components/traffic/Timeout.vue | 114 +++++++-------
dubbo-admin-ui/src/components/traffic/Weight.vue | 166 +++++++++++++--------
dubbo-admin-ui/src/router/index.js | 11 +-
dubbo-admin-ui/src/util/index.js | 1 +
17 files changed, 510 insertions(+), 383 deletions(-)
[dubbo-admin] 01/05: Merge branch 'refactor-with-go' of https://github.com/apache/dubbo-admin into refactor-with-go
Posted by li...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch refactor-with-go-components-experimental
in repository https://gitbox.apache.org/repos/asf/dubbo-admin.git
commit 032c95fc2f429de1f67c2ec6f9f7279c9327e797
Merge: 419be4e1 51445ddf
Author: chickenlj <ke...@gmail.com>
AuthorDate: Tue Jul 4 20:00:41 2023 +0800
Merge branch 'refactor-with-go' of https://github.com/apache/dubbo-admin into refactor-with-go
cmd/ui/dist/index.html | 2 +-
cmd/ui/dist/static/js/app.006d706a.js.map | 1 -
.../static/js/{app.006d706a.js => app.97288c91.js} | 4 +-
cmd/ui/dist/static/js/app.97288c91.js.map | 1 +
.../src/components/traffic/Accesslog.vue | 46 ++++++------
.../src/components/traffic/Arguments.vue | 81 +++++++++++++++++-----
dubbo-admin-ui/src/components/traffic/Gray.vue | 10 +--
dubbo-admin-ui/src/components/traffic/Mock.vue | 9 +--
dubbo-admin-ui/src/components/traffic/Region.vue | 30 +++-----
dubbo-admin-ui/src/components/traffic/Retry.vue | 57 +++++++--------
dubbo-admin-ui/src/components/traffic/Timeout.vue | 56 ++++++++-------
dubbo-admin-ui/src/components/traffic/Weight.vue | 38 +++++-----
pkg/admin/model/condition_route.go | 2 +-
pkg/admin/model/match.go | 20 +++---
pkg/admin/model/tag_route.go | 6 +-
pkg/admin/model/traffic.go | 12 ++--
pkg/admin/services/prometheus_service_impl.go | 2 +-
pkg/admin/services/route_service_impl.go | 9 ++-
pkg/admin/services/traffic/accesslog.go | 28 ++++++--
pkg/admin/services/traffic/argument.go | 16 ++---
.../services/traffic/generic_rule_operation.go | 11 +--
pkg/admin/services/traffic/gray.go | 16 +++--
pkg/admin/services/traffic/mock.go | 19 +++--
pkg/admin/services/traffic/region.go | 35 +++++++---
pkg/admin/services/traffic/retry.go | 19 +++--
pkg/admin/services/traffic/timeout.go | 21 ++++--
pkg/admin/services/traffic/weight.go | 18 +++--
27 files changed, 333 insertions(+), 236 deletions(-)
[dubbo-admin] 02/05: Merge branch 'refactor-with-go' of https://github.com/apache/dubbo-admin into refactor-with-go
Posted by li...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch refactor-with-go-components-experimental
in repository https://gitbox.apache.org/repos/asf/dubbo-admin.git
commit de5b66dfd7a37124092b05b47394e4b65c865a5d
Merge: 032c95fc ae08d9cc
Author: chickenlj <ke...@gmail.com>
AuthorDate: Wed Jul 5 12:19:05 2023 +0800
Merge branch 'refactor-with-go' of https://github.com/apache/dubbo-admin into refactor-with-go
.../charts/dubbo-admin/templates/deployment.yaml | 62 +++++++++++++---------
deploy/charts/dubbo-admin/values.yaml | 10 ++++
dubbo-admin-ui/yarn.lock | 23 ++++----
3 files changed, 55 insertions(+), 40 deletions(-)