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 4eb6f79f [charts] fix nacos server and nacos-mysql (#697)
4eb6f79f is described below
commit 4eb6f79f0c0b69c1c9ea1f18dc038fd99927deff
Author: Jian Zhong <[email protected]>
AuthorDate: Fri May 2 00:17:51 2025 +0800
[charts] fix nacos server and nacos-mysql (#697)
---
.../nacos/templates/configmap.yaml | 5 +-
.../nacos/templates/mysql-service.yaml | 47 --------
.../nacos/templates/mysql-statefulset.yaml | 96 ----------------
.../templates/{mysql-configmap.yaml => mysql.yaml} | 124 ++++++++++++++++++++-
.../nacos/templates/service.yaml | 2 +-
.../nacos/templates/statefulset.yaml | 6 +-
.../register-discovery/nacos/values.yaml | 6 +-
.../zookeeper/templates/statefulset.yaml | 9 --
8 files changed, 132 insertions(+), 163 deletions(-)
diff --git
a/manifests/charts/dubbo-control/register-discovery/nacos/templates/configmap.yaml
b/manifests/charts/dubbo-control/register-discovery/nacos/templates/configmap.yaml
index 04a2c57e..99df9b04 100644
---
a/manifests/charts/dubbo-control/register-discovery/nacos/templates/configmap.yaml
+++
b/manifests/charts/dubbo-control/register-discovery/nacos/templates/configmap.yaml
@@ -1,5 +1,4 @@
{{- $nacos := .Values -}}
-{{- $ncs := .Values.nacos }}
{{- if eq $nacos.storage.type "mysql" }}
apiVersion: v1
kind: ConfigMap
@@ -22,5 +21,5 @@ data:
mysql.user: {{ .database.username }}
mysql.password: {{ .database.password }}
mysql.param: {{ .database.param | default
"characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useSSL=false&allowPublicKeyRetrieval=true"
}}
-{{- end -}}
-{{- end -}}
+ {{- end -}}
+ {{- end -}}
\ No newline at end of file
diff --git
a/manifests/charts/dubbo-control/register-discovery/nacos/templates/mysql-service.yaml
b/manifests/charts/dubbo-control/register-discovery/nacos/templates/mysql-service.yaml
deleted file mode 100644
index 86c1d7e0..00000000
---
a/manifests/charts/dubbo-control/register-discovery/nacos/templates/mysql-service.yaml
+++ /dev/null
@@ -1,47 +0,0 @@
-{{ $nacos := .Values }}
-{{- if eq $nacos.storage.type "mysql" }}
-apiVersion: v1
-kind: Service
-metadata:
- name: nacos-mysql
- namespace: {{ .Release.Namespace }}
- labels:
- app: nacos-mysql
- dubbo.io/rev: {{ default "default" | quote }}
- install.operator.dubbo.io/owning-resource: {{ default "unknown" }}
- operator.dubbo.io/component: "Nacos"
- dubbo: nacos
- release: {{ .Release.Name }}
- app.kubernetes.io/name: "register"
-spec:
- ports:
- - name: http
- port: 3306
- targetPort: 3306
- protocol: TCP
- selector:
- app: nacos-mysql
----
-apiVersion: v1
-kind: Service
-metadata:
- name: nacos-mysql-headless
- namespace: {{ .Release.Namespace }}
- labels:
- app: nacos-mysql
- dubbo.io/rev: {{ default "default" | quote }}
- install.operator.dubbo.io/owning-resource: {{ default "unknown" }}
- operator.dubbo.io/component: "Nacos"
- dubbo: nacos
- release: {{ .Release.Name }}
- app.kubernetes.io/name: "register"
-spec:
- clusterIP: None
- ports:
- - name: http
- port: 3306
- targetPort: 3306
- protocol: TCP
- selector:
- app: nacos-mysql
-{{- end -}}
\ No newline at end of file
diff --git
a/manifests/charts/dubbo-control/register-discovery/nacos/templates/mysql-statefulset.yaml
b/manifests/charts/dubbo-control/register-discovery/nacos/templates/mysql-statefulset.yaml
deleted file mode 100644
index fc993c50..00000000
---
a/manifests/charts/dubbo-control/register-discovery/nacos/templates/mysql-statefulset.yaml
+++ /dev/null
@@ -1,96 +0,0 @@
-{{ $nacos := .Values }}
-{{- if eq $nacos.storage.type "mysql" }}
-apiVersion: apps/v1
-kind: StatefulSet
-metadata:
- name: nacos-mysql
- namespace: {{ .Release.Namespace }}
- labels:
- app: nacos-mysql
- dubbo.io/rev: {{ default "default" | quote }}
- install.operator.dubbo.io/owning-resource: {{ default "unknown" }}
- operator.dubbo.io/component: "Nacos"
- dubbo: nacos
- release: {{ .Release.Name }}
- app.kubernetes.io/name: "register"
-spec:
- replicas: 1
- serviceName: nacos-mysql-headless
- selector:
- matchLabels:
- app: nacos-mysql
- dubbo.io/rev: {{ default "default" | quote }}
- dubbo: nacos
- template:
- metadata:
- labels:
- app: nacos-mysql
- dubbo.io/rev: {{ default "default" | quote }}
- install.operator.dubbo.io/owning-resource: {{ default "unknown" }}
- operator.dubbo.io/component: "Nacos"
- dubbo: nacos
- release: {{ .Release.Name }}
- app.kubernetes.io/name: "register"
- spec:
- containers:
- - name: mysql
- image: mysql:latest
- imagePullPolicy: IfNotPresent
- ports:
- - containerPort: 3306
- env:
- {{/* MySQL initialization first startup specifies password*/}}
- - name: MYSQL_ROOT_PASSWORD
- value: "root"
- - name: MYSQL_DATABASE
- valueFrom:
- configMapKeyRef:
- name: nacos-db-config
- key: mysql.db.name
- - name: MYSQL_USER
- valueFrom:
- configMapKeyRef:
- name: nacos-db-config
- key: mysql.user
- - name: MYSQL_PASSWORD
- valueFrom:
- configMapKeyRef:
- name: nacos-db-config
- key: mysql.password
- lifecycle:
- postStart:
- exec:
- command: [ "/bin/sh", "-c", "sleep 30 && mysql -unacos -pnacos
-e 'SELECT 1 FROM nacos.config_info LIMIT 1;' || mysql -unacos -pnacos nacos <
/mysql-schema.sql" ]
- volumeMounts:
- - name: table-data
- mountPath: mysql-schema.sql
- subPath: mysql-schema.sql
- - name: data
- mountPath: /var/lib/mysql
- volumes:
- - name: table-data
- configMap:
- name: nacos-table-config
- defaultMode: 0755
-{{- end -}}
-{{/* volumeClaimTemplates:*/}}
-{{/* - metadata:*/}}
-{{/* name: data*/}}
-{{/* spec:*/}}
-{{/* accessModes:*/}}
-{{/* - ReadWriteOnce*/}}
-{{/* resources:*/}}
-{{/* requests:*/}}
-{{/* storage: 5Gi*/}}
-{{/*---*/}}
-{{/*apiVersion: v1*/}}
-{{/*kind: PersistentVolumeClaim*/}}
-{{/*metadata:*/}}
-{{/* name: mysql-pvc*/}}
-{{/*spec:*/}}
-{{/* storageClassName: rook-ceph-block*/}}
-{{/* accessModes:*/}}
-{{/* - ReadWriteOnce*/}}
-{{/* resources:*/}}
-{{/* requests:*/}}
-{{/* storage: 20Gi*/}}
diff --git
a/manifests/charts/dubbo-control/register-discovery/nacos/templates/mysql-configmap.yaml
b/manifests/charts/dubbo-control/register-discovery/nacos/templates/mysql.yaml
similarity index 76%
rename from
manifests/charts/dubbo-control/register-discovery/nacos/templates/mysql-configmap.yaml
rename to
manifests/charts/dubbo-control/register-discovery/nacos/templates/mysql.yaml
index 51eeab2b..7bf67a68 100644
---
a/manifests/charts/dubbo-control/register-discovery/nacos/templates/mysql-configmap.yaml
+++
b/manifests/charts/dubbo-control/register-discovery/nacos/templates/mysql.yaml
@@ -1,6 +1,126 @@
-# mysql -unacos -pnacos nacos < mysql-schema.sql
-{{ $nacos := .Values }}
+{{- $nacos := .Values -}}
{{- if eq $nacos.storage.type "mysql" }}
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+ name: nacos-mysql
+ namespace: {{ .Release.Namespace }}
+ labels:
+ app: nacos-mysql
+ dubbo.io/rev: {{ default "default" | quote }}
+ install.operator.dubbo.io/owning-resource: {{ default "unknown" }}
+ operator.dubbo.io/component: "Nacos"
+ dubbo: nacos
+ release: {{ .Release.Name }}
+ app.kubernetes.io/name: "register"
+spec:
+ replicas: 1
+ serviceName: nacos-mysql-headless
+ selector:
+ matchLabels:
+ app: nacos-mysql
+ dubbo.io/rev: {{ default "default" | quote }}
+ dubbo: nacos
+ template:
+ metadata:
+ labels:
+ app: nacos-mysql
+ dubbo.io/rev: {{ default "default" | quote }}
+ install.operator.dubbo.io/owning-resource: {{ default "unknown" }}
+ operator.dubbo.io/component: "Nacos"
+ dubbo: nacos
+ release: {{ .Release.Name }}
+ app.kubernetes.io/name: "register"
+ spec:
+ containers:
+ - name: mysql
+ image: mysql:latest
+ imagePullPolicy: IfNotPresent
+ ports:
+ - containerPort: 3306
+ env:
+ {{/* MySQL initialization first startup specifies password*/}}
+ - name: MYSQL_ROOT_PASSWORD
+ value: "root"
+ - name: MYSQL_DATABASE
+ valueFrom:
+ configMapKeyRef:
+ name: nacos-db-config
+ key: mysql.db.name
+ - name: MYSQL_USER
+ valueFrom:
+ configMapKeyRef:
+ name: nacos-db-config
+ key: mysql.user
+ - name: MYSQL_PASSWORD
+ valueFrom:
+ configMapKeyRef:
+ name: nacos-db-config
+ key: mysql.password
+ lifecycle:
+ postStart:
+ exec:
+ command: [ "/bin/sh", "-c", "sleep 30 && mysql -unacos -pnacos
-e 'SELECT 1 FROM nacos.config_info LIMIT 1;' || mysql -unacos -pnacos nacos <
/mysql-schema.sql" ]
+ volumeMounts:
+ - name: table-data
+ mountPath: mysql-schema.sql
+ subPath: mysql-schema.sql
+ - name: data
+ mountPath: /var/lib/mysql
+ volumes:
+ - name: table-data
+ configMap:
+ name: nacos-table-config
+ defaultMode: 0755
+ - name: data
+ emptyDir: {}
+---
+apiVersion: v1
+kind: Service
+metadata:
+ name: nacos-mysql
+ namespace: {{ .Release.Namespace }}
+ labels:
+ app: nacos-mysql
+ dubbo.io/rev: {{ default "default" | quote }}
+ install.operator.dubbo.io/owning-resource: {{ default "unknown" }}
+ operator.dubbo.io/component: "Nacos"
+ dubbo: nacos
+ release: {{ .Release.Name }}
+ app.kubernetes.io/name: "register"
+spec:
+ ports:
+ - name: http
+ port: 3306
+ targetPort: 3306
+ protocol: TCP
+ selector:
+ app: nacos-mysql
+---
+apiVersion: v1
+kind: Service
+metadata:
+ name: nacos-mysql-headless
+ namespace: {{ .Release.Namespace }}
+ labels:
+ app: nacos-mysql
+ dubbo.io/rev: {{ default "default" | quote }}
+ install.operator.dubbo.io/owning-resource: {{ default "unknown" }}
+ operator.dubbo.io/component: "Nacos"
+ dubbo: nacos
+ release: {{ .Release.Name }}
+ app.kubernetes.io/name: "register"
+spec:
+ clusterIP: None
+ ports:
+ - name: http
+ port: 3306
+ targetPort: 3306
+ protocol: TCP
+ selector:
+ app: nacos-mysql
+---
+# mysql -unacos -pnacos nacos < mysql-schema.sql
apiVersion: v1
kind: ConfigMap
metadata:
diff --git
a/manifests/charts/dubbo-control/register-discovery/nacos/templates/service.yaml
b/manifests/charts/dubbo-control/register-discovery/nacos/templates/service.yaml
index f36e4831..75364616 100644
---
a/manifests/charts/dubbo-control/register-discovery/nacos/templates/service.yaml
+++
b/manifests/charts/dubbo-control/register-discovery/nacos/templates/service.yaml
@@ -61,4 +61,4 @@ spec:
protocol: TCP
selector:
app: nacos
-{{- end -}}
+{{- end -}}
\ No newline at end of file
diff --git
a/manifests/charts/dubbo-control/register-discovery/nacos/templates/statefulset.yaml
b/manifests/charts/dubbo-control/register-discovery/nacos/templates/statefulset.yaml
index 9cf5cd90..ef08d452 100644
---
a/manifests/charts/dubbo-control/register-discovery/nacos/templates/statefulset.yaml
+++
b/manifests/charts/dubbo-control/register-discovery/nacos/templates/statefulset.yaml
@@ -48,7 +48,7 @@ spec:
containers:
- name: nacos
{{- if contains "/" $nacos.image }}
- image: {{ $nacos.image }}
+ image: {{ $nacos.image }}:v2.5.1
{{- end }}
imagePullPolicy: IfNotPresent
ports:
@@ -78,9 +78,9 @@ spec:
- name: MODE
value: "standalone"
{{- end }}
+ {{- if eq $nacos.storage.type "mysql" }}
- name: SPRING_DATASOURCE_PLATFORM
value: "mysql"
- {{- if eq $nacos.storage.type "mysql" }}
- name: MYSQL_SERVICE_HOST
valueFrom:
configMapKeyRef:
@@ -114,6 +114,8 @@ spec:
{{- else }}
- name: EMBEDDED_STORAGE
value: embedded
+ - name: SPRING_DATASOURCE_PLATFORM
+ value: ""
{{- end }}
volumeMounts:
- name: data
diff --git
a/manifests/charts/dubbo-control/register-discovery/nacos/values.yaml
b/manifests/charts/dubbo-control/register-discovery/nacos/values.yaml
index 901c4f2c..132dc0b1 100644
--- a/manifests/charts/dubbo-control/register-discovery/nacos/values.yaml
+++ b/manifests/charts/dubbo-control/register-discovery/nacos/values.yaml
@@ -17,7 +17,7 @@ _internal_default_values_not_set:
## Whether to enable the nacos.
enabled: false
## Specifies the mode in which nacos is running (standalone, cluster, etc.).
- mode: "cluster"
+ mode: ""
## Number of replicas for the Deployment.
replicas: 1
# Deploy the required container images.
@@ -25,8 +25,8 @@ _internal_default_values_not_set:
# The size of application resources required for deployment.
resources:
requests:
- cpu: 250m
- memory: 256Mi
+ cpu: 500m
+ memory: 1Gi
storage:
# Specifies the storage type (embedded, mysql, etc.).
diff --git
a/manifests/charts/dubbo-control/register-discovery/zookeeper/templates/statefulset.yaml
b/manifests/charts/dubbo-control/register-discovery/zookeeper/templates/statefulset.yaml
index b94f7454..355ed362 100644
---
a/manifests/charts/dubbo-control/register-discovery/zookeeper/templates/statefulset.yaml
+++
b/manifests/charts/dubbo-control/register-discovery/zookeeper/templates/statefulset.yaml
@@ -39,23 +39,14 @@ spec:
{{- end }}
imagePullPolicy: IfNotPresent
env:
- # The number of milliseconds of each tick
- name: TICK_TIME
value: {{ $zookeeper.tickTime | quote }}
- # The number of ticks that the initial
- # synchronization phase can take
- name: INIT_LIMIT
value: {{ $zookeeper.initLimit | quote }}
- # The number of ticks that can pass between
- # sending a request and getting an acknowledgement
- name: SYNC_LIMIT
value: {{ $zookeeper.syncLimit | quote }}
- # the directory where the snapshot is stored.
- # do not use /tmp for storage, /tmp here is just
- # example sakes.
- name: DATA_LOG_DIR
value: {{ $zoo.dataLogDir | quote }}
- # the port at which the clients will connect
- name: PORT_NUMBER
value: {{ $zookeeper.portNumber | quote }}
resources:
