modify to use descheduler.namespace setting

kubernetes-sigs · Jun 20, 2024 · d717898 · d717898
1 parent 2253e98
commit d717898
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/charts/descheduler/templates/clusterrolebinding.yaml b/charts/descheduler/templates/clusterrolebinding.yaml
@@ -12,5 +12,5 @@ roleRef:
 subjects:
  - kind: ServiceAccount
  name: {{ template "descheduler.serviceAccountName" . }}
- namespace: {{ .Release.Namespace }}
+ namespace: {{ include "descheduler.namespace" . }}
 {{- end -}}
diff --git a/charts/descheduler/templates/configmap.yaml b/charts/descheduler/templates/configmap.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
  name: {{ template "descheduler.fullname" . }}
- namespace: {{ .Release.Namespace }}
+ namespace: {{ include "descheduler.namespace" . }}
  labels:
  {{- include "descheduler.labels" . | nindent 4 }}
 data:

diff --git a/charts/descheduler/templates/cronjob.yaml b/charts/descheduler/templates/cronjob.yaml
@@ -3,7 +3,7 @@ apiVersion: {{ .Values.cronJobApiVersion | default "batch/v1" }}
 kind: CronJob
 metadata:
  name: {{ template "descheduler.fullname" . }}
- namespace: {{ .Release.Namespace }}
+ namespace: {{ include "descheduler.namespace" . }}
  labels:
  {{- include "descheduler.labels" . | nindent 4 }}
 spec:

diff --git a/charts/descheduler/templates/deployment.yaml b/charts/descheduler/templates/deployment.yaml
@@ -3,7 +3,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
  name: {{ template "descheduler.fullname" . }}
- namespace: {{ .Release.Namespace }}
+ namespace: {{ include "descheduler.namespace" . }}
  labels:
  {{- include "descheduler.labels" . | nindent 4 }}
 spec:

diff --git a/charts/descheduler/templates/service.yaml b/charts/descheduler/templates/service.yaml
@@ -6,7 +6,7 @@ metadata:
  labels:
  {{- include "descheduler.labels" . | nindent 4 }}
  name: {{ template "descheduler.fullname" . }}
- namespace: {{ .Release.Namespace }}
+ namespace: {{ include "descheduler.namespace" . }}
 spec:
  clusterIP: None
  {{- if .Values.service.ipFamilyPolicy }}

diff --git a/charts/descheduler/templates/serviceaccount.yaml b/charts/descheduler/templates/serviceaccount.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
  name: {{ template "descheduler.serviceAccountName" . }}
- namespace: {{ .Release.Namespace }}
+ namespace: {{ include "descheduler.namespace" . }}
  labels:
  {{- include "descheduler.labels" . | nindent 4 }}
 {{- if .Values.serviceAccount.annotations }}

diff --git a/charts/descheduler/templates/servicemonitor.yaml b/charts/descheduler/templates/servicemonitor.yaml
@@ -14,7 +14,7 @@ spec:
  jobLabel: jobLabel
  namespaceSelector:
  matchNames:
- - {{ .Release.Namespace }}
+ - {{ include "descheduler.namespace" . }}
  selector:
  matchLabels:
  {{- include "descheduler.selectorLabels" . | nindent 6 }}