From 49a191637e95c8c1c76ac5d9524690511488ee86 Mon Sep 17 00:00:00 2001
From: "rongfu.leng" <lenronfu@gmail.com>
Date: Fri, 11 Oct 2024 11:02:07 +0800
Subject: [PATCH] add scheduler-name field in chart file to configuration
 custome scheduler name

Signed-off-by: rongfu.leng <lenronfu@gmail.com>
---
 installer/helm/chart/volcano/templates/admission.yaml   | 3 +++
 installer/helm/chart/volcano/templates/controllers.yaml | 3 +++
 installer/helm/chart/volcano/templates/scheduler.yaml   | 3 +++
 installer/helm/chart/volcano/values.yaml                | 1 +
 installer/volcano-development.yaml                      | 3 +++
 5 files changed, 13 insertions(+)

diff --git a/installer/helm/chart/volcano/templates/admission.yaml b/installer/helm/chart/volcano/templates/admission.yaml
index 0cbeda36c9e..818edd08e53 100644
--- a/installer/helm/chart/volcano/templates/admission.yaml
+++ b/installer/helm/chart/volcano/templates/admission.yaml
@@ -133,6 +133,9 @@ spec:
             - --admission-conf=/admission.local.config/configmap/{{base .Values.basic.admission_config_file}}
             - --webhook-namespace={{ .Release.Namespace }}
             - --webhook-service-name={{ .Release.Name }}-admission-service
+            {{- if .Values.basic.scheduler_name }}
+            - --scheduler-name={{ .Values.basic.scheduler_name }}
+            {{- end }}
             - --enable-healthz=true
             - --logtostderr
             - --port={{.Values.basic.admission_port}}
diff --git a/installer/helm/chart/volcano/templates/controllers.yaml b/installer/helm/chart/volcano/templates/controllers.yaml
index 826d4bd3031..a4f6b81bbc4 100644
--- a/installer/helm/chart/volcano/templates/controllers.yaml
+++ b/installer/helm/chart/volcano/templates/controllers.yaml
@@ -156,6 +156,9 @@ spec:
               - --logtostderr
               - --enable-healthz=true
               - --leader-elect={{ .Values.custom.leader_elect_enable }}
+              {{- if .Values.basic.scheduler_name }}
+              - --scheduler-name={{ .Values.basic.scheduler_name }}
+              {{- end }}
               {{- if .Values.custom.leader_elect_enable }}
               - --leader-elect-resource-namespace={{ .Release.Namespace }}
               {{- end }}
diff --git a/installer/helm/chart/volcano/templates/scheduler.yaml b/installer/helm/chart/volcano/templates/scheduler.yaml
index e69f2ac3d23..abea6ba8147 100644
--- a/installer/helm/chart/volcano/templates/scheduler.yaml
+++ b/installer/helm/chart/volcano/templates/scheduler.yaml
@@ -177,6 +177,9 @@ spec:
           args:
             - --logtostderr
             - --scheduler-conf=/volcano.scheduler/{{base .Values.basic.scheduler_config_file}}
+            {{- if .Values.basic.scheduler_name }}
+            - --scheduler-name={{ .Values.basic.scheduler_name }}
+            {{- end }}
             - --enable-healthz=true
             - --enable-metrics=true
             - --leader-elect={{ .Values.custom.leader_elect_enable }}
diff --git a/installer/helm/chart/volcano/values.yaml b/installer/helm/chart/volcano/values.yaml
index 968e35c77ec..8c7daf91e49 100644
--- a/installer/helm/chart/volcano/values.yaml
+++ b/installer/helm/chart/volcano/values.yaml
@@ -5,6 +5,7 @@ basic:
   admission_secret_name: "volcano-admission-secret"
   admission_config_file: "config/volcano-admission.conf"
   scheduler_config_file: "config/volcano-scheduler.conf"
+  scheduler_name: "volcano"
   image_pull_secret: ""
   image_pull_policy: "Always"
   image_tag_version: "latest"
diff --git a/installer/volcano-development.yaml b/installer/volcano-development.yaml
index 6ebe086dcef..97555b2a331 100644
--- a/installer/volcano-development.yaml
+++ b/installer/volcano-development.yaml
@@ -142,6 +142,7 @@ spec:
             - --admission-conf=/admission.local.config/configmap/volcano-admission.conf
             - --webhook-namespace=volcano-system
             - --webhook-service-name=volcano-admission-service
+            - --scheduler-name=volcano
             - --enable-healthz=true
             - --logtostderr
             - --port=8443
@@ -4357,6 +4358,7 @@ spec:
               - --logtostderr
               - --enable-healthz=true
               - --leader-elect=false
+              - --scheduler-name=volcano
               - -v=4
               - 2>&1
             imagePullPolicy: Always
@@ -4527,6 +4529,7 @@ spec:
           args:
             - --logtostderr
             - --scheduler-conf=/volcano.scheduler/volcano-scheduler.conf
+            - --scheduler-name=volcano
             - --enable-healthz=true
             - --enable-metrics=true
             - --leader-elect=false