resolve merge conflicts

Signed-off-by: aakcht <aakcht@gmail.com>
volcano-sh · Jun 1, 2023 · 64768c9 · 64768c9
1 parent 1495275
commit 64768c9
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 41 deletions.
diff --git a/installer/README.md b/installer/README.md
@@ -14,10 +14,13 @@ Kubernetes that are commonly required by many classes of batch & elastic workloa
 ## Installing volcano via yaml file
 
 All-in-one yaml has been generated for quick deployment. Try command:
+
 ```$xslt
 kubectl apply -f volcano-v0.0.x.yaml
 ```
+
 Check the status in namespace `volcano-system`
+
 ```$xslt
 $kubectl get all -n volcano-system
 NAME                                       READY   STATUS      RESTARTS   AGE
@@ -129,7 +132,6 @@ $ helm install --name volcano-release --set basic.image_pull_policy=Always volca
 
 The above command set image pull policy to `Always`, so docker image will be pulled each time.
 
-
 Alternatively, a YAML file that specifies the values for the parameters can be provided while installing the chart. For example,
 
 ```bash

diff --git a/installer/helm/chart/volcano/templates/admission.yaml b/installer/helm/chart/volcano/templates/admission.yaml
@@ -140,19 +140,6 @@ spec:
           configMap:
             name: {{ .Release.Name }}-admission-configmap
 
-      {{- with .Values.nodeSelector }}
-      nodeSelector:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.affinity }}
-      affinity:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.tolerations }}
-      tolerations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-
 ---
 apiVersion: v1
 kind: Service

diff --git a/installer/helm/chart/volcano/templates/controllers.yaml b/installer/helm/chart/volcano/templates/controllers.yaml
@@ -145,16 +145,4 @@ spec:
               - -v=4
               - 2>&1
             imagePullPolicy: {{ .Values.basic.image_pull_policy }}
-      {{- with .Values.nodeSelector }}
-      nodeSelector:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.affinity }}
-      affinity:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.tolerations }}
-      tolerations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
 {{- end }}
diff --git a/installer/helm/chart/volcano/templates/scheduler.yaml b/installer/helm/chart/volcano/templates/scheduler.yaml
@@ -167,18 +167,6 @@ spec:
         - name: scheduler-config
           configMap:
             name: {{ .Release.Name }}-scheduler-configmap
-      {{- with .Values.nodeSelector }}
-      nodeSelector:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.affinity }}
-      affinity:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.tolerations }}
-      tolerations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
 ---
 apiVersion: v1
 kind: Service

diff --git a/installer/helm/chart/volcano/values.yaml b/installer/helm/chart/volcano/values.yaml
@@ -19,9 +19,6 @@ custom:
   scheduler_replicas: 1
   leader_elect_enable: false
   enabled_admissions: "/jobs/mutate,/jobs/validate,/podgroups/mutate,/pods/validate,/pods/mutate,/queues/mutate,/queues/validate"
-nodeSelector: {}
-affinity: []
-tolerations: []
 
 # Specify affinity for all main Volcano components or per component.
 # For example: