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 c695e9fe [charts] Update admin nacos and zookeeper config (#737)
c695e9fe is described below
commit c695e9fec0577277bb8249f23ab5e41f7b000ea6
Author: Jian Zhong <[email protected]>
AuthorDate: Mon Jun 23 16:36:25 2025 +0800
[charts] Update admin nacos and zookeeper config (#737)
---
manifests/charts/admin/templates/_pod.tpl | 2 +-
manifests/charts/admin/templates/configmap.yaml | 41 ++++++++++---------------
manifests/charts/admin/values.yaml | 10 ++++--
3 files changed, 25 insertions(+), 28 deletions(-)
diff --git a/manifests/charts/admin/templates/_pod.tpl
b/manifests/charts/admin/templates/_pod.tpl
index 48444602..e0b327ae 100644
--- a/manifests/charts/admin/templates/_pod.tpl
+++ b/manifests/charts/admin/templates/_pod.tpl
@@ -19,7 +19,7 @@ containers:
timeoutSeconds: 5
securityContext:
allowPrivilegeEscalation: false
- readOnlyRootFilesystem: true
+ readOnlyRootFilesystem: false
runAsNonRoot: false
capabilities:
drop:
diff --git a/manifests/charts/admin/templates/configmap.yaml
b/manifests/charts/admin/templates/configmap.yaml
index 5bd029bd..697e6e52 100644
--- a/manifests/charts/admin/templates/configmap.yaml
+++ b/manifests/charts/admin/templates/configmap.yaml
@@ -18,49 +18,42 @@ data:
deployMode: {{ .Values.deployMode }}
mode: {{ .Values.mode }}
store:
- {{- if $nacos.nacos.enabled }}
+ {{- if $nacos.enabled }}
# Traditional Store support nacos and zookeeper
traditional:
registry:
- address: nacos://nacos:8848?username=nacos&password=nacos
+ address: {{ .Values.nacosAddress }}
configCenter:
- address: nacos://nacos:8848?username=nacos&password=nacos
+ address: {{ .Values.nacosAddress }}
metadataReport:
- address: nacos://nacos:8848?username=nacos&password=nacos
- {{- else if $zookeeper.zookeeper.enabled }}
- traditional:
- registry:
- address: zookeeper://zookeeper:2181
- configCenter:
- address: zookeeper://zookeeper:2181
- metadataReport:
- address: zookeeper://zookeeper:2181
- {{- else }}
+ address: {{ .Values.nacosAddress }}
+ {{- end }}
+ {{- if $zookeeper.enabled }}
traditional:
registry:
- address: nacos://nacos:8848?username=nacos&password=nacos
+ address: {{ .Values.zookeeperAddress }}
configCenter:
- address: nacos://nacos:8848?username=nacos&password=nacos
+ address: {{ .Values.zookeeperAddress }}
metadataReport:
- address: nacos://nacos:8848?username=nacos&password=nacos
+ address: {{ .Values.zookeeperAddress }}
{{- end }}
admin:
# metric and trace grafana dashboards
- metricDashboards:
+ metricDashboards:
application:
- baseURL:
http://grafana:3000/d/a0b114ca-edf7-4dfe-ac2c-34a4fc545fed/application
+ baseURL: {{ .Values.grafanaAddress
}}/d/a0b114ca-edf7-4dfe-ac2c-34a4fc545fed/application
instance:
- baseURL:
http://grafana:3000/d/dcf5defe-d198-4704-9edf-6520838880e9/instance
+ baseURL: {{ .Values.grafanaAddress
}}/d/dcf5defe-d198-4704-9edf-6520838880e9/instance
service:
- baseURL:
http://grafana:3000/d/ec689613-b4a1-45b1-b8bd-9d557059f970/service/
+ baseURL: {{ .Values.grafanaAddress
}}/d/ec689613-b4a1-45b1-b8bd-9d557059f970/service/
traceDashboards:
application:
- baseURL:
http://grafana:3000/d/e968a89b-f03d-42e3-8ad3-930ae815cb0f/application
+ baseURL: {{ .Values.grafanaAddress
}}/d/e968a89b-f03d-42e3-8ad3-930ae815cb0f/application
instance:
- baseURL:
http://grafana:3000/d/f5f48f75-13ec-489b-88ae-635ae38d8618/instance
+ baseURL: {{ .Values.grafanaAddress
}}/d/f5f48f75-13ec-489b-88ae-635ae38d8618/instance
service:
- baseURL:
http://grafana:3000/d/b2e178fb-ada3-4d5e-9f54-de99e7f07662/service
- prometheus: {{ .Values.prometheus }}
+ baseURL: {{ .Values.grafanaAddress
}}/d/b2e178fb-ada3-4d5e-9f54-de99e7f07662/service
+ prometheus: {{ .Values.prometheusAddress }}
# grafana should custom configs below:
# [server]
# root_url = %(protocol)s://%(domain)s：%(http_port)s/grafana
diff --git a/manifests/charts/admin/values.yaml
b/manifests/charts/admin/values.yaml
index b3f42f2e..7b9b9346 100644
--- a/manifests/charts/admin/values.yaml
+++ b/manifests/charts/admin/values.yaml
@@ -19,7 +19,7 @@ _internal_default_values_not_set:
rollingMaxUnavailable: 25%
image: mfordjody/dubbo-cp
- tag: latest
+ tag: test
volumeMounts: []
@@ -46,6 +46,10 @@ _internal_default_values_not_set:
password: Dubbo@2025
expirationTime: 7200
- prometheus: http://prometheus.dubbo-system:9090
+ zookeeperAddress: zookeeper://zookeeper:2181
- grafana: http://grafana.dubbo-system:3000
\ No newline at end of file
+ nacosAddress: nacos://nacos:8848?username=nacos&password=nacos
+
+ grafanaAddress: http://grafana.dubbo-system:3000
+
+ prometheusAddress: http://prometheus.dubbo-system:9090
