(dubbo-kubernetes) branch master updated: [charts] add default profile options (#624)

[zhongxjian]

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 21d44ebb [charts] add default profile options (#624)
21d44ebb is described below

commit 21d44ebbbea4d0d74eba195221e9ef0e00efe541
Author: Jian Zhong <11638...@qq.com>
AuthorDate: Tue Feb 25 09:17:44 2025 +0800

    [charts] add default profile options (#624)
---
 .../register-discovery/nacos/templates/configmap.yaml         |  5 +++--
 .../register-discovery/nacos/templates/service.yaml           |  5 +++--
 .../register-discovery/nacos/templates/statefulset.yaml       | 11 ++++++-----
 3 files changed, 12 insertions(+), 9 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 1bdb7cfa..60153952 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,6 @@
 {{- $nacos := .Values -}}
-{{- if eq $nacos.storage.type "mysql" }}
+{{- $ncs := .Values.nacos }}
+{{- if eq $nacos.storage.type "mysql" | default $ncs.storage.type }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -15,7 +16,7 @@ metadata:
   {{- toYaml . | nindent 4 }}
   {{- end }}
 data:
-  {{- with $nacos.storage }}
+  {{- with $nacos.storage | default $ncs.storage }}
   mysql.db.host: {{ .db.host }}
   mysql.db.name: {{ .db.name }}
   mysql.port: "{{ .db.host | default 3306 }}"
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 e5857175..4fad1de5 100644
--- 
a/manifests/charts/dubbo-control/register-discovery/nacos/templates/service.yaml
+++ 
b/manifests/charts/dubbo-control/register-discovery/nacos/templates/service.yaml
@@ -1,4 +1,5 @@
 {{- $nacos := .Values -}}
+{{- $ncs   := .Values.nacos }}
 {{- $service := $nacos.service -}}
 apiVersion: v1
 kind: Service
@@ -49,7 +50,7 @@ spec:
   selector:
     app: {{ template "nacos.selector" . }}
 ---
-{{- if and (eq $nacos.mode "cluster") }}
+{{- if and (eq $nacos.mode "cluster"|default $ncs.mode) }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -89,7 +90,7 @@ spec:
   {{- end }}
   ports:
   - name: http
-    port: {{ template "nacos.port" }}
+    port: 8848
     targetPort: http
     protocol: TCP
   - name: clientgen-rpc
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 0f20764d..2185b718 100644
--- 
a/manifests/charts/dubbo-control/register-discovery/nacos/templates/statefulset.yaml
+++ 
b/manifests/charts/dubbo-control/register-discovery/nacos/templates/statefulset.yaml
@@ -1,4 +1,5 @@
 {{- $nacos := .Values -}}
+{{- $ncs := .Values.nacos }}
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
@@ -31,7 +32,7 @@ spec:
       {{- if $nacos.securityContext.enabled }}
       {{- omit $nacos.securityContext "enabled" | toYaml | nindent 8 }}
       {{- end }}
-      {{- if and (eq $nacos.mode "cluster") ($nacos.plugin.enabled) }}
+      {{- if and (eq $nacos.mode "cluster" |default $ncs.mode) 
($nacos.plugin.enabled | default $ncs.plugin.enabled) }}
       initContainers:
         - name: peer-finder-plugin-install
           image: {{ $nacos.plugin.image.registry }}:{{ $nacos.plugin.image.tag 
}}
@@ -63,7 +64,7 @@ spec:
         {{- end }}
         ports:
         - name: http
-          containerPort: {{ template "nacos.port" . }}
+          containerPort: 8848
         - name: clientgen-rpc
           containerPort: {{ add $nacos.serverPort 1000 }}
         - name: raft-rpc
@@ -79,10 +80,10 @@ spec:
           value: {{ $nacos.serverPort | quote }}
         - name: PREFER_HOST_MODE
           value: {{ $nacos.preferhostmode | quote }}
-        {{- if eq $nacos.mode "standalone" }}
+        {{- if eq $nacos.mode "standalone" |default $ncs.mode }}
         - name: MODE
           value: "standalone"
-        {{- else if eq $nacos.mode "cluster" }}
+        {{- else if eq $nacos.mode "cluster" |default $ncs.mode }}
         - name: SERVICE_NAME
           value: "{{ template "nacos.name" . }}-headless"
         - name: DOMAIN_NAME
@@ -93,7 +94,7 @@ spec:
               apiVersion: v1
               fieldPath: metadata.namespace
         {{- end }}
-        {{- if eq $nacos.storage.type "mysql" }}
+        {{- if eq $nacos.storage.type "mysql" | default $ncs.storage.type }}
         - name: SPRING_DATASOURCE_PLATFORM
           value: "mysql"
         - name: MYSQL_SERVICE_HOST