fix dubbo-admin (#1213)

apache · Aug 14, 2023 · 8562ead · 8562ead
1 parent 67ff737
commit 8562ead
Show file tree

Hide file tree

Showing 162 changed files with 2,401 additions and 2,501 deletions.
diff --git a/.github/workflows/deploy-authority.yml b/.github/workflows/deploy-authority.yml
diff --git a/.licenserc.yaml b/.licenserc.yaml
@@ -74,8 +74,9 @@ header:
     - '**/go.sum'
     - '**/addons/manifests/**'
     - '**/cmd/ui/dist/**'
-    - '**/dubbo-admin-ui/public/echarts-en.min.js'
-    - '**/dubbo-admin-ui/tests/**'
+    - '**/ui/public/echarts-en.min.js'
+    - '**/ui/tests/**'
+    - '**/dubbo-ui/**'
     - '**/governance_config_mock.go'
   comment: on-failure
 

diff --git a/api/resource/v1alpha1/ca_deepcopy.go b/api/resource/v1alpha1/ca_deepcopy.go
diff --git a/api/resource/v1alpha1/traffic_deepcopy.go b/api/resource/v1alpha1/traffic_deepcopy.go
diff --git a/app/dubbo-cp/cmd/run.go b/app/dubbo-cp/cmd/run.go
@@ -19,11 +19,13 @@ package cmd
 
 import (
 	"fmt"
-	"github.com/apache/dubbo-admin/pkg/core/kubeclient"
-	"github.com/apache/dubbo-admin/pkg/snp"
 	"time"
 
 	"github.com/apache/dubbo-admin/pkg/admin"
+	"github.com/apache/dubbo-admin/pkg/core/kubeclient"
+	"github.com/apache/dubbo-admin/pkg/dds"
+	"github.com/apache/dubbo-admin/pkg/snp"
+
 	"github.com/apache/dubbo-admin/pkg/authority"
 	"github.com/apache/dubbo-admin/pkg/config"
 	dubbo_cp "github.com/apache/dubbo-admin/pkg/config/app/dubbo-cp"
@@ -32,7 +34,6 @@ import (
 	"github.com/apache/dubbo-admin/pkg/core/cmd"
 	"github.com/apache/dubbo-admin/pkg/core/logger"
 	"github.com/apache/dubbo-admin/pkg/cp-server"
-	"github.com/apache/dubbo-admin/pkg/dds"
 	"github.com/spf13/cobra"
 )
 

diff --git a/app/dubbo-ui/dist/echarts-en.min.js b/app/dubbo-ui/dist/echarts-en.min.js
diff --git a/app/dubbo-ui/dist/index.html b/app/dubbo-ui/dist/index.html
@@ -1 +1,2 @@
+
 <!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>Dubbo Admin</title><link href=/admin/OpenSans.css rel=stylesheet type=text/css><link rel="shortcut icon" href=/admin/dubbo.ico type=image/x-icon><script src=/admin/echarts-en.min.js></script><link href=/admin/static/css/app.4791f1de.css rel=preload as=style><link href=/admin/static/css/chunk-vendors.52f99f04.css rel=preload as=style><link href=/admin/static/js/app.74d999b7.js rel=preload as=script><link href=/admin/static/js/braceBase.39ce0e20.js rel=preload as=script><link href=/admin/static/js/chunk-vendors.604d7b41.js rel=preload as=script><link href=/admin/static/css/chunk-vendors.52f99f04.css rel=stylesheet><link href=/admin/static/css/app.4791f1de.css rel=stylesheet></head><body><div id=app></div><script src=/admin/static/js/braceBase.39ce0e20.js></script><script src=/admin/static/js/chunk-vendors.604d7b41.js></script><script src=/admin/static/js/app.74d999b7.js></script></body></html>
diff --git a/app/dubbo-ui/dist/static/css/app.4791f1de.css b/app/dubbo-ui/dist/static/css/app.4791f1de.css
diff --git a/app/dubbo-ui/dist/static/css/chunk-vendors.52f99f04.css b/app/dubbo-ui/dist/static/css/chunk-vendors.52f99f04.css
diff --git a/app/dubbo-ui/dist/static/js/app.74d999b7.js b/app/dubbo-ui/dist/static/js/app.74d999b7.js
diff --git a/app/dubbo-ui/dist/static/js/app.74d999b7.js.map b/app/dubbo-ui/dist/static/js/app.74d999b7.js.map
diff --git a/app/dubbo-ui/dist/static/js/braceBase.39ce0e20.js b/app/dubbo-ui/dist/static/js/braceBase.39ce0e20.js
diff --git a/app/dubbo-ui/dist/static/js/braceBase.39ce0e20.js.map b/app/dubbo-ui/dist/static/js/braceBase.39ce0e20.js.map
diff --git a/app/dubbo-ui/dist/static/js/chunk-vendors.604d7b41.js b/app/dubbo-ui/dist/static/js/chunk-vendors.604d7b41.js
diff --git a/app/dubbo-ui/dist/static/js/chunk-vendors.604d7b41.js.map b/app/dubbo-ui/dist/static/js/chunk-vendors.604d7b41.js.map
diff --git a/app/dubboctl/cmd/subcmd/dashboard_all_cmds.go b/app/dubboctl/cmd/subcmd/dashboard_all_cmds.go
@@ -170,6 +170,9 @@ func portForward(args *DashboardCommonArgs, compName operator.ComponentName, wri
 	pods, err := cli.CoreV1().Pods(args.namespace).List(context.Background(), metav1.ListOptions{
 		LabelSelector: labelSelector,
 	})
+	if err != nil {
+		return fmt.Errorf("list pod failed, err: %s", err)
+	}
 	if len(pods.Items) < 1 {
 		return fmt.Errorf("no %s pods found", string(compName))
 	}

diff --git a/conf/admin.yml b/conf/admin.yml
@@ -32,14 +32,22 @@ security:
   webhook-allow-on-err: true
 kube-config:
   namespace: dubbo-system
-  service-name: dubbo-ca
+  service-name: dubbo-cp
   in-pod-env: false
   rest-config-qps: 50
   rest-config-burst: 100
+  kube-file-config: ""
+  domain-suffix: cluster.local
 grpc-cp-server:
   plain-server-port: 30060
   secure-server-port: 30062
   debug-port: 30070
+options:
+  debounce-after: 100000000
+  debounce-max: 10000000000
+  enable-debounce: true
+  send-timeout: 5000000000
+  dds-block-max-time: 15000000000
 dubbo:
   registries:
     demoZK:
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@

		<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>Dubbo Admin</title><link href=/admin/OpenSans.css rel=stylesheet type=text/css><link rel="shortcut icon" href=/admin/dubbo.ico type=image/x-icon><script src=/admin/echarts-en.min.js></script><link href=/admin/static/css/app.4791f1de.css rel=preload as=style><link href=/admin/static/css/chunk-vendors.52f99f04.css rel=preload as=style><link href=/admin/static/js/app.74d999b7.js rel=preload as=script><link href=/admin/static/js/braceBase.39ce0e20.js rel=preload as=script><link href=/admin/static/js/chunk-vendors.604d7b41.js rel=preload as=script><link href=/admin/static/css/chunk-vendors.52f99f04.css rel=stylesheet><link href=/admin/static/css/app.4791f1de.css rel=stylesheet></head><body><div id=app></div><script src=/admin/static/js/braceBase.39ce0e20.js></script><script src=/admin/static/js/chunk-vendors.604d7b41.js></script><script src=/admin/static/js/app.74d999b7.js></script></body></html>