(dubbo-kubernetes) branch master updated: [charts] Correction of namespace (#476)

[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 bae10834 [charts] Correction of namespace (#476)
bae10834 is described below

commit bae108340d398ff2c29fe6722874d697a9d1c632
Author: mfordjody <11638...@qq.com>
AuthorDate: Mon Oct 21 21:41:38 2024 +0800

    [charts] Correction of namespace (#476)
---
 manifests/charts/admin/templates/admin/admin-deployment.yaml          | 4 ++--
 manifests/charts/admin/templates/admin/admin-statefulset.yaml         | 4 ++--
 .../charts/admin/templates/register/zookeeper/zookeeper-service.yaml  | 2 +-
 .../admin/templates/register/zookeeper/zookeeper-statefulset.yaml     | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/manifests/charts/admin/templates/admin/admin-deployment.yaml 
b/manifests/charts/admin/templates/admin/admin-deployment.yaml
index b7e0e93f..061a165a 100644
--- a/manifests/charts/admin/templates/admin/admin-deployment.yaml
+++ b/manifests/charts/admin/templates/admin/admin-deployment.yaml
@@ -76,8 +76,8 @@ spec:
         {{- $nacosReplicas := int $nacos.replicas -}}
         {{- $zooHeadless := printf "%s-%s" $zooName "headless" | trunc 63 -}}
         {{- $nacosHeadless := printf "%s-%s" $nacosName "headless" | trunc 63 
-}}
-        {{- $zooNamespace := include "zoo.namespace" . -}}
-        {{- $nacosNamespace := include "nacos.namespace" . -}}
+        {{- $zooNamespace := include "admin.namespace" . -}}
+        {{- $nacosNamespace := include "admin.namespace" . -}}
         {{- $clusterDomain := $admin.clusterDomain -}}
         {{- $zooPort := include "zoo.client" . -}}
         {{- $nacosPort := $nacos.serverPort -}}
diff --git a/manifests/charts/admin/templates/admin/admin-statefulset.yaml 
b/manifests/charts/admin/templates/admin/admin-statefulset.yaml
index 2cf98847..fa62f534 100644
--- a/manifests/charts/admin/templates/admin/admin-statefulset.yaml
+++ b/manifests/charts/admin/templates/admin/admin-statefulset.yaml
@@ -77,8 +77,8 @@ spec:
         {{- $nacosReplicas := int $nacos.replicas -}}
         {{- $zooHeadless := printf "%s-%s" $zooName "headless" | trunc 63 -}}
         {{- $nacosHeadless := printf "%s-%s" $nacosName "headless" | trunc 63 
-}}
-        {{- $zooNamespace := include "zoo.namespace" . -}}
-        {{- $nacosNamespace := include "nacos.namespace" . -}}
+        {{- $zooNamespace := include "admin.namespace" . -}}
+        {{- $nacosNamespace := include "admin.namespace" . -}}
         {{- $clusterDomain := $admin.clusterDomain -}}
         {{- $zooPort := include "zoo.client" . -}}
         {{- $nacosPort := $nacos.serverPort -}}
diff --git 
a/manifests/charts/admin/templates/register/zookeeper/zookeeper-service.yaml 
b/manifests/charts/admin/templates/register/zookeeper/zookeeper-service.yaml
index 4ebe399d..158844da 100644
--- a/manifests/charts/admin/templates/register/zookeeper/zookeeper-service.yaml
+++ b/manifests/charts/admin/templates/register/zookeeper/zookeeper-service.yaml
@@ -51,7 +51,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ template "zoo.name" . }}-headless
-  namespace: {{ template "zoo.namespace" . }}
+  namespace: {{ template "admin.namespace" . }}
   labels:
   {{- include "zoo.labels" . | nindent 4 }}
   {{- with .Values.labels }}
diff --git 
a/manifests/charts/admin/templates/register/zookeeper/zookeeper-statefulset.yaml
 
b/manifests/charts/admin/templates/register/zookeeper/zookeeper-statefulset.yaml
index cf45d47d..41746289 100644
--- 
a/manifests/charts/admin/templates/register/zookeeper/zookeeper-statefulset.yaml
+++ 
b/manifests/charts/admin/templates/register/zookeeper/zookeeper-statefulset.yaml
@@ -75,7 +75,7 @@ spec:
         {{- $zooName := include "zoo.name" . }}
         {{- $zooReplicas := int .Values.zookeeper.replicas  }}
         {{- $zooHeadless := printf "%s-%s" $zooName "headless" | trunc 63 }}
-        {{- $zooNamespace := include "zoo.namespace" . }}
+        {{- $zooNamespace := include "admin.namespace" . }}
         {{- $zooDomain := $zoo.clusterDomain }}
         - name: ZOO_SERVERS
           value: {{ range $k, $v := until $zooReplicas }}{{ $zooName }}-{{ $v 
}}.{{ $zooName }}.{{ $zooNamespace }}.svc.{{ $zooDomain }}:2888:3888::{{ add $v 
1 }} {{ end }}