(dubbo-kubernetes) branch master updated: [charts] Change register namespaces (#475)

[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 d09204fe [charts] Change register namespaces (#475)
d09204fe is described below

commit d09204fe537fb421e94778652dd633b2d49fd904
Author: mfordjody <11638...@qq.com>
AuthorDate: Mon Oct 21 21:27:25 2024 +0800

    [charts] Change register namespaces (#475)
---
 .../charts/admin/templates/modular/_namespaces.tpl | 22 ----------------------
 .../templates/register/nacos/nacos-configmap.yaml  |  2 +-
 .../templates/register/nacos/nacos-service.yaml    |  2 +-
 .../register/nacos/nacos-statefulset.yaml          |  2 +-
 .../register/zookeeper/zookeeper-configmap.yaml    |  2 +-
 .../register/zookeeper/zookeeper-service.yaml      |  2 +-
 .../register/zookeeper/zookeeper-statefulset.yaml  |  2 +-
 7 files changed, 6 insertions(+), 28 deletions(-)

diff --git a/manifests/charts/admin/templates/modular/_namespaces.tpl 
b/manifests/charts/admin/templates/modular/_namespaces.tpl
index 02cc2eb9..6fb0baa2 100644
--- 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
index d6a2b516..a5268eb8 100644
--- 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
index ee5ae1d7..c8fb4a0f 100644
--- 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
index b2930d07..30bcde0f 100644
--- 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
index 26ef95e7..6ccbdb4d 100644
--- 
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
index 52fa7bdc..4ebe399d 100644
--- 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 }}
diff --git 
a/manifests/charts/admin/templates/register/zookeeper/zookeeper-statefulset.yaml
 
b/manifests/charts/admin/templates/register/zookeeper/zookeeper-statefulset.yaml
index f1f39255..cf45d47d 100644
--- 
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 }}