Merge pull request #1782 from consideRatio/kube-scheduler-rbac-followup

user-scheduler: tweak modern configuration
jupyterhub · Sep 21, 2020 · d363004 · d363004
2 parents 4d7ef68 + 9594ed3
commit d363004
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/jupyterhub/templates/scheduling/user-scheduler/configmap.yaml b/jupyterhub/templates/scheduling/user-scheduler/configmap.yaml
@@ -17,16 +17,7 @@ data:
     profiles:
       - schedulerName: {{ .Release.Name }}-user-scheduler
         plugins:
-          {{- if .Values.scheduling.userScheduler.plugins }}
           {{- .Values.scheduling.userScheduler.plugins | toYaml | trimSuffix "\n" | nindent 10 }}
-          {{- else }}
-          score:
-            disabled:
-              - name: NodeResourcesLeastAllocated
-              - name: NodeResourcesBalancedAllocation
-            enabled:
-              - name: NodeResourcesMostAllocated
-          {{- end }}
 
   {{- $defaultPolicy := .Files.Get "files/userscheduler-defaultpolicy.yaml" | fromYaml }}
   policy.cfg: {{ .Values.scheduling.userScheduler.policy | default $defaultPolicy | toJson | quote }}

diff --git a/jupyterhub/values.yaml b/jupyterhub/values.yaml
@@ -316,7 +316,15 @@ scheduling:
     enabled: true
     replicas: 2
     logLevel: 4
-    plugins: {}
+    plugins:
+      score:
+        disabled:
+          - name: ImageLocality
+          - name: NodeResourcesLeastAllocated
+          - name: NodeResourcesBalancedAllocation
+          - name: SelectorSpread
+        enabled:
+          - name: NodeResourcesMostAllocated
     image:
       name: k8s.gcr.io/kube-scheduler
       tag: v1.19.1