Merge remote-tracking branch 'origin/master'

apache · Oct 21, 2024 · 5129030 · 5129030
2 parents ffb49fb + bae1083
commit 5129030
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 34 deletions.
diff --git 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
@@ -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/modular/_namespaces.tpl b/manifests/charts/admin/templates/modular/_namespaces.tpl
@@ -5,28 +5,6 @@ Return Dubbo Namespace to use.
 {{- "dubbo-system" | default }}
 {{- end }}
 
-{{/*
-Return ZooKeeper Namespace to use.
-*/}}
-{{- define "zoo.namespace" -}}
-{{- if .Values.zookeeper.namespaceOverride -}}
-{{- .Values.zookeeper.namespaceOverride }}
-{{- else -}}
-{{- .Release.Namespace }}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Return Nacos Namespace to use.
-*/}}
-{{- define "nacos.namespace" -}}
-{{- if .Values.nacos.namespaceOverride -}}
-{{- .Values.nacos.namespaceOverride }}
-{{- else -}}
-{{- .Release.Namespace }}
-{{- end -}}
-{{- end -}}
-
 {{/*
 Return Jobs Namespace to use.
 */}}

diff --git a/manifests/charts/admin/templates/register/nacos/nacos-configmap.yaml b/manifests/charts/admin/templates/register/nacos/nacos-configmap.yaml
@@ -4,7 +4,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ template "nacos.name" . }}-db-config
-  namespace: {{ template "nacos.namespace" . }}
+  namespace: {{ template "admin.namespace" . }}
   labels:
   {{- include "nacos.labels" . | nindent 4 }}
   {{- with $nacos.labels }}

diff --git a/manifests/charts/admin/templates/register/nacos/nacos-service.yaml b/manifests/charts/admin/templates/register/nacos/nacos-service.yaml
@@ -5,7 +5,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ template "nacos.name" . }}
-  namespace: {{ template "nacos.namespace" . }}
+  namespace: {{ template "admin.namespace" . }}
   labels:
   {{- include "nacos.labels" . | nindent 4 }}
   {{- with $nacos.labels }}

diff --git a/manifests/charts/admin/templates/register/nacos/nacos-statefulset.yaml b/manifests/charts/admin/templates/register/nacos/nacos-statefulset.yaml
@@ -4,7 +4,7 @@ apiVersion: {{ template "apiVersion" . }}
 kind: StatefulSet
 metadata:
   name: {{ template "nacos.name" . }}
-  namespace: {{ template "nacos.namespace" . }}
+  namespace: {{ template "admin.namespace" . }}
   labels:
   {{- include "nacos.labels" . | nindent 4 }}
   {{- with $nacos.labels }}

diff --git a/manifests/charts/admin/templates/register/zookeeper/zookeeper-configmap.yaml b/manifests/charts/admin/templates/register/zookeeper/zookeeper-configmap.yaml
@@ -4,7 +4,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ template "zoo.name" . }}-scripts
-  namespace: {{ template "zoo.namespace" . }}
+  namespace: {{ template "admin.namespace" . }}
   labels:
   {{- include "zoo.labels" . | nindent 4 }}
   {{- with $zoo.labels }}

diff --git a/manifests/charts/admin/templates/register/zookeeper/zookeeper-service.yaml b/manifests/charts/admin/templates/register/zookeeper/zookeeper-service.yaml
@@ -5,7 +5,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ template "zoo.name" . }}
-  namespace: {{ template "zoo.namespace" . }}
+  namespace: {{ template "admin.namespace" . }}
   labels:
   {{- include "zoo.labels" . | nindent 4 }}
   {{- with $zoo.labels }}
@@ -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
@@ -4,7 +4,7 @@ apiVersion: {{ template "apiVersion" . }}
 kind: StatefulSet
 metadata:
   name: {{ template "zoo.name" . }}
-  namespace: {{ template "zoo.namespace" . }}
+  namespace: {{ template "admin.namespace" . }}
   labels:
   {{- include "zoo.labels" . | nindent 4 }}
   {{- with $zoo.labels }}
@@ -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 }}