diff --git a/charts/karmada/templates/karmada-controller-manager.yaml b/charts/karmada/templates/karmada-controller-manager.yaml index 94713f1f0..bfa75fdac 100644 --- a/charts/karmada/templates/karmada-controller-manager.yaml +++ b/charts/karmada/templates/karmada-controller-manager.yaml @@ -1,5 +1,6 @@ {{- if eq .Values.installMode "host" }} {{- $name := include "karmada.name" . -}} +{{- $systemNamespace := .Values.systemNamespace -}} apiVersion: apps/v1 kind: Deployment metadata: @@ -55,7 +56,7 @@ spec: - --bind-address=0.0.0.0 - --cluster-status-update-frequency=10s - --secure-port=10357 - - --leader-elect-resource-namespace={{ include "karmada.namespace" . }} + - --leader-elect-resource-namespace={{ $systemNamespace }} - --v=2 {{- if .Values.controllerManager.controllers }} - --controllers={{ .Values.controllerManager.controllers }} diff --git a/charts/karmada/templates/karmada-descheduler.yaml b/charts/karmada/templates/karmada-descheduler.yaml index 238e0215c..8647a1271 100644 --- a/charts/karmada/templates/karmada-descheduler.yaml +++ b/charts/karmada/templates/karmada-descheduler.yaml @@ -1,4 +1,5 @@ {{- $name := include "karmada.name" . -}} +{{- $systemNamespace := .Values.systemNamespace -}} {{- if and (or (eq .Values.installMode "component") (eq .Values.installMode "host")) (has "descheduler" .Values.components) }} apiVersion: apps/v1 kind: Deployment @@ -48,7 +49,7 @@ spec: - /bin/karmada-descheduler - --kubeconfig=/etc/kubeconfig - --bind-address=0.0.0.0 - - --leader-elect-resource-namespace={{ include "karmada.namespace" . }} + - --leader-elect-resource-namespace={{ $systemNamespace }} - --v=4 livenessProbe: httpGet: diff --git a/charts/karmada/templates/karmada-scheduler.yaml b/charts/karmada/templates/karmada-scheduler.yaml index 832141be9..2d77970ee 100644 --- a/charts/karmada/templates/karmada-scheduler.yaml +++ b/charts/karmada/templates/karmada-scheduler.yaml @@ -1,5 +1,5 @@ {{- $name := include "karmada.name" . -}} - +{{- $systemNamespace := .Values.systemNamespace -}} {{- if eq .Values.installMode "host" }} apiVersion: apps/v1 kind: Deployment @@ -50,7 +50,7 @@ spec: - --kubeconfig=/etc/kubeconfig - --bind-address=0.0.0.0 - --secure-port=10351 - - --leader-elect-resource-namespace={{ include "karmada.namespace" . }} + - --leader-elect-resource-namespace={{ $systemNamespace }} livenessProbe: httpGet: path: /healthz