Merge pull request #3234 from chaunceyjiang/karmda-system

Fixed the system namespace to "karmada-system".
This commit is contained in:
karmada-bot 2023-03-03 11:28:09 +08:00 committed by GitHub
commit afc7efa864
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 5 deletions

View File

@ -1,5 +1,6 @@
{{- define "karmada.apiservice" -}} {{- define "karmada.apiservice" -}}
{{- $name := include "karmada.name" . -}} {{- $name := include "karmada.name" . -}}
{{- $systemNamespace := .Values.systemNamespace -}}
{{- if eq .Values.installMode "host" }} {{- if eq .Values.installMode "host" }}
--- ---
apiVersion: apiregistration.k8s.io/v1 apiVersion: apiregistration.k8s.io/v1
@ -15,7 +16,7 @@ spec:
groupPriorityMinimum: 2000 groupPriorityMinimum: 2000
service: service:
name: {{ $name }}-aggregated-apiserver name: {{ $name }}-aggregated-apiserver
namespace: {{ include "karmada.namespace" . }} namespace: {{ $systemNamespace }}
version: v1alpha1 version: v1alpha1
versionPriority: 10 versionPriority: 10
--- ---
@ -23,7 +24,7 @@ apiVersion: v1
kind: Service kind: Service
metadata: metadata:
name: {{ $name }}-aggregated-apiserver name: {{ $name }}-aggregated-apiserver
namespace: {{ include "karmada.namespace" . }} namespace: {{ $systemNamespace }}
spec: spec:
type: ExternalName type: ExternalName
externalName: {{ $name }}-aggregated-apiserver.{{ include "karmada.namespace" . }}.svc.{{ .Values.clusterDomain }} externalName: {{ $name }}-aggregated-apiserver.{{ include "karmada.namespace" . }}.svc.{{ .Values.clusterDomain }}
@ -43,7 +44,7 @@ spec:
groupPriorityMinimum: 2000 groupPriorityMinimum: 2000
service: service:
name: {{ $name }}-search name: {{ $name }}-search
namespace: {{ include "karmada.namespace" . }} namespace: {{ $systemNamespace }}
version: v1alpha1 version: v1alpha1
versionPriority: 10 versionPriority: 10
--- ---
@ -51,7 +52,7 @@ apiVersion: v1
kind: Service kind: Service
metadata: metadata:
name: {{ $name }}-search name: {{ $name }}-search
namespace: {{ include "karmada.namespace" . }} namespace: {{ $systemNamespace }}
spec: spec:
type: ExternalName type: ExternalName
externalName: {{ $name }}-search.{{ include "karmada.namespace" . }}.svc.{{ .Values.clusterDomain }} externalName: {{ $name }}-search.{{ include "karmada.namespace" . }}.svc.{{ .Values.clusterDomain }}

View File

@ -3,7 +3,7 @@
apiVersion: v1 apiVersion: v1
kind: Namespace kind: Namespace
metadata: metadata:
name: {{ include "karmada.namespace" . }} name: {{ .Values.systemNamespace }}
--- ---
apiVersion: v1 apiVersion: v1
kind: Namespace kind: Namespace

View File

@ -20,6 +20,8 @@ installMode: "host"
## @param clusterDomain default domain for karmada ## @param clusterDomain default domain for karmada
clusterDomain: "cluster.local" clusterDomain: "cluster.local"
systemNamespace: "karmada-system"
## @param components component list ## @param components component list
components: [] components: []
# components: [ # components: [