Merge pull request #3514 from consideRatio/pr/kube-scheduler-bump

user-scheduler: update kube-scheduler binary from 1.28.14 to 1.30.5
jupyterhub · Sep 23, 2024 · d02709c · d02709c
2 parents 2c007a1 + 38e583f
commit d02709c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 9 deletions.
diff --git a/docs/source/changelog.md b/docs/source/changelog.md
@@ -14,7 +14,6 @@ changes in pull requests], this list should be updated.
 
 - Update jupyterhub from 4.1.6 to 5.1.0 [#3405](https://github.com/jupyterhub/zero-to-jupyterhub-k8s/pull/3405), [#3416](https://github.com/jupyterhub/zero-to-jupyterhub-k8s/pull/3416), [#3425](https://github.com/jupyterhub/zero-to-jupyterhub-k8s/pull/3425), [#3472](https://github.com/jupyterhub/zero-to-jupyterhub-k8s/pull/3472)
 - Drop support for k8s 1.23-1.27, require k8s 1.28+ [#3312](https://github.com/jupyterhub/zero-to-jupyterhub-k8s/pull/3312), [#3403](https://github.com/jupyterhub/zero-to-jupyterhub-k8s/pull/3403), [#3319](https://github.com/jupyterhub/zero-to-jupyterhub-k8s/pull/3319), [#3508](https://github.com/jupyterhub/zero-to-jupyterhub-k8s/pull/3508)
-- user-scheduler: update to use kube-scheduler 1.28, from 1.26 [#3312](https://github.com/jupyterhub/zero-to-jupyterhub-k8s/pull/3312)
 
 ## 3.3
 

diff --git a/jupyterhub/templates/scheduling/user-scheduler/rbac.yaml b/jupyterhub/templates/scheduling/user-scheduler/rbac.yaml
@@ -22,9 +22,10 @@ rules:
   #       - unchanged between 1.22 and 1.27
   #       - changed in 1.28: permissions to get/update lock endpoint resource
   #                          removed
-  #       - unchanged between 1.28 and 1.29
+  #       - unchanged between 1.28 and 1.30
+  #       - (1.31 is known to bring some changes below)
   #
-  # ref: https://github.com/kubernetes/kubernetes/blob/v1.29.0/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/testdata/cluster-roles.yaml#L721-L862
+  # ref: https://github.com/kubernetes/kubernetes/blob/v1.30.0/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/testdata/cluster-roles.yaml#L721-L862
   - apiGroups:
     - ""
     - events.k8s.io

diff --git a/jupyterhub/values.yaml b/jupyterhub/values.yaml
@@ -453,19 +453,24 @@ scheduling:
     #
     plugins:
       score:
-        # These scoring plugins are enabled by default according to
-        # https://kubernetes.io/docs/reference/scheduling/config/#scheduling-plugins
-        # 2022-02-22.
+        # We make use of the default scoring plugins, but we re-enable some with
+        # a new priority, leave some enabled with their lower default priority,
+        # and disable some.
         #
-        # Enabled with high priority:
+        # Below are the default scoring plugins as of 2024-09-23 according to
+        # https://kubernetes.io/docs/reference/scheduling/config/#scheduling-plugins.
+        #
+        # Re-enabled with high priority:
         # - NodeAffinity
         # - InterPodAffinity
         # - NodeResourcesFit
         # - ImageLocality
+        #
         # Remains enabled with low default priority:
         # - TaintToleration
         # - PodTopologySpread
         # - VolumeBinding
+        #
         # Disabled for scoring:
         # - NodeResourcesBalancedAllocation
         #
@@ -494,12 +499,12 @@ scheduling:
       - name: NodeResourcesFit
         args:
           scoringStrategy:
+            type: MostAllocated
             resources:
               - name: cpu
                 weight: 1
               - name: memory
                 weight: 1
-            type: MostAllocated
     containerSecurityContext:
       runAsNonRoot: true
       runAsUser: 65534 # nobody user
@@ -545,7 +550,7 @@ scheduling:
       # here. We aim to stay around 1 minor version behind the latest k8s
       # version.
       #
-      tag: "v1.28.14" # ref: https://github.com/kubernetes/kubernetes/tree/master/CHANGELOG
+      tag: "v1.30.5" # ref: https://github.com/kubernetes/kubernetes/tree/master/CHANGELOG
       pullPolicy:
       pullSecrets: []
     nodeSelector: {}