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 10c885d8 [charts] Organize configuration files (#451)
10c885d8 is described below
commit 10c885d8a65ecade6875b7b0b3e8e1cd583b0d3a
Author: mfordjody <[email protected]>
AuthorDate: Sun Oct 13 17:58:02 2024 +0800
[charts] Organize configuration files (#451)
---
.../charts/admin/templates/admin/admin-cm.yaml | 4 +-
.../charts/admin/templates/admin/admin-dep.yaml | 4 +-
.../charts/admin/templates/admin/admin-sts.yaml | 24 +++++++----
.../templates/custom/jobs/jobs-crds-scripts.yaml | 6 +--
manifests/charts/admin/values.yaml | 50 ++++++++++++++++++++++
5 files changed, 73 insertions(+), 15 deletions(-)
diff --git a/manifests/charts/admin/templates/admin/admin-cm.yaml
b/manifests/charts/admin/templates/admin/admin-cm.yaml
index c955420a..cec7275a 100644
--- a/manifests/charts/admin/templates/admin/admin-cm.yaml
+++ b/manifests/charts/admin/templates/admin/admin-cm.yaml
@@ -3,7 +3,7 @@
apiVersion: v1
kind: ConfigMap
metadata:
- name: {{ include "admin.name" . }}-control-plane-config
+ name: {{ include "admin.name" . }}-server-config
namespace: {{ template "admin.namespace" . }}
labels:
{{- include "admin.labels" . | nindent 4 }}
@@ -12,7 +12,7 @@ metadata:
{{- end }}
data:
{{/* TODO */}}
- config.yaml: |-
+ dubbo-cp.yaml: |-
{{- if $admin.cp }}
{{ toYaml $admin.cp | nindent 4 | trim }}
{{ end }}
diff --git a/manifests/charts/admin/templates/admin/admin-dep.yaml
b/manifests/charts/admin/templates/admin/admin-dep.yaml
index e7388754..1fc1c8c2 100644
--- a/manifests/charts/admin/templates/admin/admin-dep.yaml
+++ b/manifests/charts/admin/templates/admin/admin-dep.yaml
@@ -148,9 +148,9 @@ spec:
{{- if $admin.volumes }}
{{- toYaml $admin.volumes | nindent 6 }}
{{- end }}
- - name: {{ include "admin.name" . }}-control-plane-config
+ - name: {{ include "admin.name" . }}-server-config
configMap:
- name: {{ include "admin.name" . }}-control-plane-config
+ name: {{ include "admin.name" . }}-server-config
{{- if $cp.tls.secretName }}
- name: general-tls-cert
secret:
diff --git a/manifests/charts/admin/templates/admin/admin-sts.yaml
b/manifests/charts/admin/templates/admin/admin-sts.yaml
index a6b1292a..d3e792d4 100644
--- a/manifests/charts/admin/templates/admin/admin-sts.yaml
+++ b/manifests/charts/admin/templates/admin/admin-sts.yaml
@@ -1,4 +1,5 @@
{{- $admin := .Values -}}
+{{- $cp := .Values.cp -}}
{{- $zoo := .Values.zookeeper -}}
{{- $nacos := .Values.nacos -}}
{{- $observable := $admin.observable -}}
@@ -127,16 +128,23 @@ spec:
{{- if $admin.volumes }}
{{- toYaml $admin.volumes | nindent 6 }}
{{- end }}
- - name: config
+ - name: {{ include "admin.name" . }}-server-config
configMap:
- {{- if $admin.configMap }}
- {{- toYaml $admin.configMap | nindent 10 }}
- {{- end }}
- - name: secret
+ name: {{ include "admin.name" . }}-server-config
+ {{- if $cp.tls.secretName }}
+ - name: general-tls-cert
secret:
- {{- if $admin.secret }}
- {{- toYaml $admin.secret | nindent 10 }}
- {{- end }}
+ secretName: {{ $cp.tls.secretName }}
+ {{- else }}
+ - name: general-tls-cert
+ secret:
+ secretName: {{ include "admin.name" . }}-tls-cert
+ {{- end }}
+ {{- if $cp.tls.caSecretName }}
+ - name: general-tls-cert-ca
+ secret:
+ secretName: {{ $cp.tls.caSecretName }}
+ {{- end }}
volumeClaimTemplates:
- metadata:
name: storage
diff --git
a/manifests/charts/admin/templates/custom/jobs/jobs-crds-scripts.yaml
b/manifests/charts/admin/templates/custom/jobs/jobs-crds-scripts.yaml
index 6e824f36..98dcd143 100644
--- a/manifests/charts/admin/templates/custom/jobs/jobs-crds-scripts.yaml
+++ b/manifests/charts/admin/templates/custom/jobs/jobs-crds-scripts.yaml
@@ -10,9 +10,9 @@ metadata:
{{- toYaml . | nindent 4 }}
{{- end }}
annotations:
- "helm.sh/hook": "pre-upgrade,pre-install"
- "helm.sh/hook-weight": "-1"
- "helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded"
+ "helm.sh/hook": "pre-install"
+ "helm.sh/hook-weight": "1"
+ "helm.sh/hook-delete-policy": "before-hook-creation"
{{- with $jobs.annotations }}
{{- toYaml . | nindent 4 }}
{{- end }}
diff --git a/manifests/charts/admin/values.yaml
b/manifests/charts/admin/values.yaml
index 8402acce..5e57f9ac 100644
--- a/manifests/charts/admin/values.yaml
+++ b/manifests/charts/admin/values.yaml
@@ -324,6 +324,56 @@ cp:
caSecretName: ""
caBundle: ""
+
+
+
+
+deploy_mode: universal
+#mode: test
+mode: zone
+store:
+ traditional:
+ config_center: zookeeper://localhost:2181
+ registry:
+ address: zookeeper://localhost:2181
+ metadata_report:
+ address: zookeeper://localhost:2181
+#store:
+# traditional:
+# config_center: nacos://localhost:8848
+# registry:
+# address: nacos://localhost:8848
+# metadata_report:
+# address: nacos://localhost:8848
+admin:
+ metric_dashboards:
+ application:
+ baseURL:
http://47.251.100.138:3000/d/a0b114ca-edf7-4dfe-ac2c-34a4fc545fed/application
+ instance:
+ baseURL:
http://47.251.100.138:3000/d/dcf5defe-d198-4704-9edf-6520838880e9/instance
+ service:
+ baseURL:
http://47.251.100.138:3000/d/ec689613-b4a1-45b1-b8bd-9d557059f970/service/
+ trace_dashboards:
+ application:
+ baseURL:
http://47.251.100.138:3000/d/e968a89b-f03d-42e3-8ad3-930ae815cb0f/application
+ instance:
+ baseURL:
http://47.251.100.138:3000/d/f5f48f75-13ec-489b-88ae-635ae38d8618/instance
+ service:
+ baseURL:
http://47.251.100.138:3000/d/b2e178fb-ada3-4d5e-9f54-de99e7f07662/service
+ prometheus: http://prometheus.observability.svc.cluster.local:9090/
+#multizone:
+# zone:
+# globalAddress: grpc://127.0.0.1:5685
+# global:
+# dds:
+# grpcPort: 5685
+runtime:
+ kubernetes:
+ admissionServer:
+ address: 10.23.132.51
+ port: 5443
+ certDir: test/cert
+
auth:
## Whether to enable the control-plane auth control.
enabled: false
