From 4c47ea1eb177458846cebb5154676621e120c031 Mon Sep 17 00:00:00 2001
From: chaunceyjiang <chaunceyjiang@gmail.com>
Date: Wed, 1 Mar 2023 18:17:14 +0800
Subject: [PATCH] Fix the system namespace to "karmada-system".

Signed-off-by: chaunceyjiang <chaunceyjiang@gmail.com>
---
 charts/karmada/templates/_karmada_apiservice.tpl       | 9 +++++----
 charts/karmada/templates/_karmada_system_namespace.tpl | 2 +-
 charts/karmada/values.yaml                             | 2 ++
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/charts/karmada/templates/_karmada_apiservice.tpl b/charts/karmada/templates/_karmada_apiservice.tpl
index 7f20f01c2..7f86446da 100644
--- a/charts/karmada/templates/_karmada_apiservice.tpl
+++ b/charts/karmada/templates/_karmada_apiservice.tpl
@@ -1,5 +1,6 @@
 {{- define "karmada.apiservice" -}}
 {{- $name := include "karmada.name" . -}}
+{{- $systemNamespace := .Values.systemNamespace -}}
 {{- if eq .Values.installMode "host" }}
 ---
 apiVersion: apiregistration.k8s.io/v1
@@ -15,7 +16,7 @@ spec:
   groupPriorityMinimum: 2000
   service:
     name: {{ $name }}-aggregated-apiserver
-    namespace: {{ include "karmada.namespace" . }}
+    namespace: {{ $systemNamespace }}
   version: v1alpha1
   versionPriority: 10
 ---
@@ -23,7 +24,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ $name }}-aggregated-apiserver
-  namespace: {{ include "karmada.namespace" . }}
+  namespace: {{ $systemNamespace }}
 spec:
   type: ExternalName
   externalName: {{ $name }}-aggregated-apiserver.{{ include "karmada.namespace" . }}.svc.{{ .Values.clusterDomain }}
@@ -43,7 +44,7 @@ spec:
   groupPriorityMinimum: 2000
   service:
     name: {{ $name }}-search
-    namespace: {{ include "karmada.namespace" . }}
+    namespace: {{ $systemNamespace }}
   version: v1alpha1
   versionPriority: 10
 ---
@@ -51,7 +52,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ $name }}-search
-  namespace: {{ include "karmada.namespace" . }}
+  namespace: {{ $systemNamespace }}
 spec:
   type: ExternalName
   externalName: {{ $name }}-search.{{ include "karmada.namespace" . }}.svc.{{ .Values.clusterDomain }}
diff --git a/charts/karmada/templates/_karmada_system_namespace.tpl b/charts/karmada/templates/_karmada_system_namespace.tpl
index f65ddf9e0..6504fc33b 100644
--- a/charts/karmada/templates/_karmada_system_namespace.tpl
+++ b/charts/karmada/templates/_karmada_system_namespace.tpl
@@ -3,7 +3,7 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-  name: {{ include "karmada.namespace" . }}
+  name: {{ .Values.systemNamespace }}
 ---
 apiVersion: v1
 kind: Namespace
diff --git a/charts/karmada/values.yaml b/charts/karmada/values.yaml
index 445e57f0c..85104ce04 100644
--- a/charts/karmada/values.yaml
+++ b/charts/karmada/values.yaml
@@ -20,6 +20,8 @@ installMode: "host"
 ## @param clusterDomain default domain for karmada
 clusterDomain: "cluster.local"
 
+systemNamespace: "karmada-system"
+
 ## @param components component list
 components: []
   # components: [