(dubbo-kubernetes) branch master updated: [charts] Changing the default value (#479)

[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 3c5bb52b [charts] Changing the default value (#479)
3c5bb52b is described below

commit 3c5bb52b3dadd9a7c2105c2a69a2ae00a0d5db98
Author: mfordjody <11638...@qq.com>
AuthorDate: Wed Oct 23 08:47:31 2024 +0800

    [charts] Changing the default value (#479)
---
 manifests/charts/admin/templates/admin/admin-deployment.yaml  | 6 +++---
 manifests/charts/admin/templates/admin/admin-statefulset.yaml | 6 +++---
 manifests/charts/admin/values.yaml                            | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/manifests/charts/admin/templates/admin/admin-deployment.yaml 
b/manifests/charts/admin/templates/admin/admin-deployment.yaml
index 4ba7f97c..d6890c8b 100644
--- a/manifests/charts/admin/templates/admin/admin-deployment.yaml
+++ b/manifests/charts/admin/templates/admin/admin-deployment.yaml
@@ -82,11 +82,11 @@ spec:
         {{- $zooPort := include "zoo.client" . -}}
         {{- $nacosPort := $nacos.serverPort -}}
         {{- $register := .Values.register }}
-        {{- if (eq $register true) | default true }}
-        {{- if $zoo.enabled }}
+        {{- if (eq $register true) }}
+        {{- if and (eq $register $zoo.enabled true) }}
         - name: DUBBO_STORE_TRADITIONAL_REGISTRY
           value: zookeeper://{{ $zooName }}.{{ $zooNamespace }}.svc.{{ 
$clusterDomain }}:{{ $zooPort }}
-          {{- else if $nacos.enabled }}
+          {{- else if and (eq $register $nacos.enabled true) }}
         - name: DUBBO_STORE_TRADITIONAL_REGISTRY
           value: nacos://{{ range $k, $v := until $nacosReplicas }}{{ 
$nacosName }}-{{ $v }}.{{ $nacosName }}.{{ $nacosNamespace }}.svc.{{ 
$clusterDomain }}:{{ $nacosPort }}{{ if ne (add $k 1) $nacosReplicas }},{{ end 
}}{{ end }}
           {{- else }}
diff --git a/manifests/charts/admin/templates/admin/admin-statefulset.yaml 
b/manifests/charts/admin/templates/admin/admin-statefulset.yaml
index 8903d7aa..a9d0a315 100644
--- a/manifests/charts/admin/templates/admin/admin-statefulset.yaml
+++ b/manifests/charts/admin/templates/admin/admin-statefulset.yaml
@@ -83,11 +83,11 @@ spec:
         {{- $zooPort := include "zoo.client" . -}}
         {{- $nacosPort := $nacos.serverPort -}}
         {{- $register := .Values.register }}
-        {{- if (eq $register true) | default true }}
-        {{- if $zoo.enabled }}
+        {{- if (eq $register true) }}
+        {{- if and (eq $register $zoo.enabled true) }}
           - name: DUBBO_STORE_TRADITIONAL_REGISTRY
             value: zookeeper://{{ $zooName }}.{{ $zooNamespace }}.svc.{{ 
$clusterDomain }}:{{ $zooPort }}
-          {{- else if $nacos.enabled }}
+          {{- else if and (eq $register $nacos.enabled true) }}
           - name: DUBBO_STORE_TRADITIONAL_REGISTRY
             value: nacos://{{ range $k, $v := until $nacosReplicas }}{{ 
$nacosName }}-{{ $v }}.{{ $nacosName }}.{{ $nacosNamespace }}.svc.{{ 
$clusterDomain }}:{{ $nacosPort }}{{ if ne (add $k 1) $nacosReplicas }},{{ end 
}}{{ end }}
           {{- else }}
diff --git a/manifests/charts/admin/values.yaml 
b/manifests/charts/admin/values.yaml
index f5ba1973..bda0025f 100644
--- a/manifests/charts/admin/values.yaml
+++ b/manifests/charts/admin/values.yaml
@@ -463,9 +463,9 @@ kubePrometheus:
 
   dashboardsVersion: 1.14
 
-register: false
+register: true
 
-mesh: true
+mesh: false
 
 jaeger:
   enabled: true