Merge pull request #396 from TommyLike/cleanup/charts

[cleanup] Only generate required scheduler configmap
volcano-sh · Aug 19, 2019 · 7ba297f · 7ba297f
2 parents 68302a1 + cba5f36
commit 7ba297f
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 19 deletions.
diff --git a/hack/generate-yaml.sh b/hack/generate-yaml.sh
@@ -67,7 +67,6 @@ fi
 cat ${VK_ROOT}/installer/namespace.yaml > ${DEPLOYMENT_FILE}
 ${HELM_BIN_DIR}/helm template ${VK_ROOT}/installer/helm/chart/volcano --namespace volcano-system \
       --name volcano --set basic.image_tag_version=${VOLCANO_IMAGE_TAG} \
-      --set basic.scheduler_config_file=volcano-scheduler.conf \
       -x templates/admission.yaml \
       -x templates/batch_v1alpha1_job.yaml \
       -x templates/bus_v1alpha1_command.yaml \

diff --git a/hack/run-e2e-kind.sh b/hack/run-e2e-kind.sh
@@ -38,7 +38,7 @@ function install-volcano {
   kind load docker-image ${MPI_EXAMPLE_IMAGE}  ${CLUSTER_CONTEXT}
 
   echo "Install volcano chart"
-  helm install installer/helm/chart/volcano --namespace kube-system --name ${CLUSTER_NAME} --kubeconfig ${KUBECONFIG} --set basic.image_tag_version=${TAG} --set basic.scheduler_config_file=volcano-scheduler-ci.conf --wait
+  helm install installer/helm/chart/volcano --namespace kube-system --name ${CLUSTER_NAME} --kubeconfig ${KUBECONFIG} --set basic.image_tag_version=${TAG} --set basic.scheduler_config_file=config/volcano-scheduler-ci.conf --wait
 }
 
 function uninstall-volcano {

diff --git a/installer/README.md b/installer/README.md
@@ -73,7 +73,7 @@ The following are the list configurable parameters of Volcano Chart and their de
 |`basic.scheduler_image_name`|Scheduler Docker Image Name|`volcanosh/vc-scheduler`|
 |`basic.admission_image_name`|Admission Controller Image Name|`volcanosh/vc-admission`|
 |`basic.admission_secret_name`|Volcano Admission Secret Name|`volcano-admission-secret`|
-|`basic.scheduler_config_file`|Configuration File name for Scheduler|`volcano-scheduler.conf`|
+|`basic.scheduler_config_file`|Configuration File name for Scheduler|`config/volcano-scheduler.conf`|
 |`basic.image_pull_secret`|Image Pull Secret|`""`|
 |`basic.image_pull_policy`|Image Pull Policy|`IfNotPresent`|
 |`basic.admission_app_name`|Admission Controller App Name|`volcano-admission`|

diff --git a/installer/helm/chart/volcano/templates/scheduler.yaml b/installer/helm/chart/volcano/templates/scheduler.yaml
@@ -4,7 +4,7 @@ metadata:
   name: {{ .Release.Name }}-scheduler-configmap
   namespace: {{ .Release.Namespace }}
 data:
-  {{- (.Files.Glob "config/*").AsConfig | nindent 2 }}
+  {{- (.Files.Glob .Values.basic.scheduler_config_file).AsConfig | nindent 2 }}
 ---
 apiVersion: v1
 kind: ServiceAccount
@@ -110,7 +110,7 @@ spec:
           image: {{.Values.basic.scheduler_image_name}}:{{.Values.basic.image_tag_version}}
           args:
             - --alsologtostderr
-            - --scheduler-conf=/volcano.scheduler/{{.Values.basic.scheduler_config_file}}
+            - --scheduler-conf=/volcano.scheduler/{{base .Values.basic.scheduler_config_file}}
             - -v=3
             - 2>&1
           imagePullPolicy: "IfNotPresent"

diff --git a/installer/helm/chart/volcano/values.yaml b/installer/helm/chart/volcano/values.yaml
@@ -4,5 +4,5 @@ basic:
   scheduler_image_name: "volcanosh/vc-scheduler"
   admission_image_name: "volcanosh/vc-admission"
   admission_secret_name: "volcano-admission-secret"
-  scheduler_config_file: "volcano-scheduler.conf"
+  scheduler_config_file: "config/volcano-scheduler.conf"
   image_pull_secret: ""
diff --git a/installer/volcano-development.yaml b/installer/volcano-development.yaml
@@ -10,19 +10,6 @@ metadata:
   name: volcano-scheduler-configmap
   namespace: volcano-system
 data:
-  volcano-scheduler-ci.conf: |
-    actions: "enqueue, reclaim, allocate, backfill, preempt"
-    tiers:
-    - plugins:
-      - name: priority
-      - name: gang
-      - name: conformance
-    - plugins:
-      - name: drf
-      - name: predicates
-      - name: proportion
-      - name: nodeorder
-      - name: binpack
   volcano-scheduler.conf: |
     actions: "enqueue, allocate, backfill"
     tiers: