This is an automated email from the ASF dual-hosted git repository.
zhongxjian pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-kubernetes.git
The following commit(s) were added to refs/heads/master by this push:
new 3e7a22ad [dubboctl] Optimized naming and file path locations (#484)
3e7a22ad is described below
commit 3e7a22adf98c3791f04d61fbdc2473d835e0d58c
Author: mfordjody <[email protected]>
AuthorDate: Fri Oct 25 12:15:46 2024 +0800
[dubboctl] Optimized naming and file path locations (#484)
---
dubboctl/cmd/dashboard_all_cmds.go | 2 +-
dubboctl/identifier/{constant.go => const.go} | 2 +-
dubboctl/identifier/{env.go => path.go} | 19 +++++++++----------
dubboctl/internal/kube/operator.go | 2 +-
dubboctl/internal/manifest/render/render.go | 2 +-
dubboctl/internal/manifest/render/render_test.go | 2 +-
.../application-metrics.json | 0
.../application-traces.json | 0
.../instance-metrics.json | 0
.../instance-traces.json | 0
.../service-metrics.json | 0
.../service-traces.json | 0
12 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/dubboctl/cmd/dashboard_all_cmds.go
b/dubboctl/cmd/dashboard_all_cmds.go
index b2cfca57..6e31d631 100644
--- a/dubboctl/cmd/dashboard_all_cmds.go
+++ b/dubboctl/cmd/dashboard_all_cmds.go
@@ -84,7 +84,7 @@ func (dca *DashboardCommonArgs) setDefault() {
dca.host = "127.0.0.1"
}
if dca.namespace == "" {
- dca.namespace = identifier.DubboSystemNamespace
+ dca.namespace = identifier.DubboDefaultNamespace
}
}
diff --git a/dubboctl/identifier/constant.go b/dubboctl/identifier/const.go
similarity index 95%
rename from dubboctl/identifier/constant.go
rename to dubboctl/identifier/const.go
index 6c883717..fc668c66 100644
--- a/dubboctl/identifier/constant.go
+++ b/dubboctl/identifier/const.go
@@ -16,5 +16,5 @@
package identifier
const (
- DubboSystemNamespace = "dubbo-system"
+ DubboDefaultNamespace = "dubbo-system"
)
diff --git a/dubboctl/identifier/env.go b/dubboctl/identifier/path.go
similarity index 75%
rename from dubboctl/identifier/env.go
rename to dubboctl/identifier/path.go
index 29d203bd..3de9877b 100644
--- a/dubboctl/identifier/env.go
+++ b/dubboctl/identifier/path.go
@@ -25,20 +25,19 @@ import (
)
var (
- // deploy dir is root in embed.FS
- deployUri = &url.URL{
+ manifestsUri = &url.URL{
Scheme: filesystem.EmbedSchema,
OmitHost: true,
}
-
- chartsUri = deployUri.JoinPath("charts")
- profilesUri = deployUri.JoinPath("profiles")
- addonsUri = deployUri.JoinPath("addons")
+ chartsUri = manifestsUri.JoinPath("charts")
+ profilesUri = manifestsUri.JoinPath("profiles")
+ addonsUri = manifestsUri.JoinPath("addons")
addonDashboardsUri = addonsUri.JoinPath("addons/dashboards")
- Charts = chartsUri.String()
- Addons = addonsUri.String()
- AddonDashboards = addonDashboardsUri.String()
- Profiles = profilesUri.String()
+
+ Charts = chartsUri.String()
+ Profiles = profilesUri.String()
+ Addons = addonsUri.String()
+ AddonDashboards = addonDashboardsUri.String()
)
var UnionFS filesystem.UnionFS
diff --git a/dubboctl/internal/kube/operator.go
b/dubboctl/internal/kube/operator.go
index e064f56a..d3d9de46 100644
--- a/dubboctl/internal/kube/operator.go
+++ b/dubboctl/internal/kube/operator.go
@@ -98,7 +98,7 @@ func NewDubboOperator(spec *v1alpha1.DubboConfigSpec, cli
*CtlClient) (*DubboOpe
}
ns := spec.Namespace
if ns == "" {
- ns = identifier.DubboSystemNamespace
+ ns = identifier.DubboDefaultNamespace
}
// initialize components
components := make(map[ComponentName]Component)
diff --git a/dubboctl/internal/manifest/render/render.go
b/dubboctl/internal/manifest/render/render.go
index ae87bff7..d6a69f24 100644
--- a/dubboctl/internal/manifest/render/render.go
+++ b/dubboctl/internal/manifest/render/render.go
@@ -245,7 +245,7 @@ func verifyRendererOptions(opts *RendererOptions) error {
}
if opts.Namespace == "" {
// logger.Log("using default namespace)
- opts.Namespace = identifier.DubboSystemNamespace
+ opts.Namespace = identifier.DubboDefaultNamespace
}
if opts.FS == nil {
return errors.New("missing chart FS for Renderer")
diff --git a/dubboctl/internal/manifest/render/render_test.go
b/dubboctl/internal/manifest/render/render_test.go
index 52c259ab..2a6a63d8 100644
--- a/dubboctl/internal/manifest/render/render_test.go
+++ b/dubboctl/internal/manifest/render/render_test.go
@@ -93,7 +93,7 @@ func TestNewLocalRenderer(t *testing.T) {
func TestLocalRenderer_RenderManifest(t *testing.T) {
renderer, err := NewLocalRenderer(
WithName(TestName),
- WithNamespace(identifier.DubboSystemNamespace),
+ WithNamespace(identifier.DubboDefaultNamespace),
WithFS(TestFS),
WithDir(TestDir))
if err != nil {
diff --git a/manifests/addons/grafana-dashboards/application-metrics.json
b/manifests/addons/dashboards/application-metrics.json
similarity index 100%
rename from manifests/addons/grafana-dashboards/application-metrics.json
rename to manifests/addons/dashboards/application-metrics.json
diff --git a/manifests/addons/grafana-dashboards/application-traces.json
b/manifests/addons/dashboards/application-traces.json
similarity index 100%
rename from manifests/addons/grafana-dashboards/application-traces.json
rename to manifests/addons/dashboards/application-traces.json
diff --git a/manifests/addons/grafana-dashboards/instance-metrics.json
b/manifests/addons/dashboards/instance-metrics.json
similarity index 100%
rename from manifests/addons/grafana-dashboards/instance-metrics.json
rename to manifests/addons/dashboards/instance-metrics.json
diff --git a/manifests/addons/grafana-dashboards/instance-traces.json
b/manifests/addons/dashboards/instance-traces.json
similarity index 100%
rename from manifests/addons/grafana-dashboards/instance-traces.json
rename to manifests/addons/dashboards/instance-traces.json
diff --git a/manifests/addons/grafana-dashboards/service-metrics.json
b/manifests/addons/dashboards/service-metrics.json
similarity index 100%
rename from manifests/addons/grafana-dashboards/service-metrics.json
rename to manifests/addons/dashboards/service-metrics.json
diff --git a/manifests/addons/grafana-dashboards/service-traces.json
b/manifests/addons/dashboards/service-traces.json
similarity index 100%
rename from manifests/addons/grafana-dashboards/service-traces.json
rename to manifests/addons/dashboards/service-traces.json
