Skip to content

Commit d02709c

Browse files
authored
Merge pull request #3514 from consideRatio/pr/kube-scheduler-bump
user-scheduler: update kube-scheduler binary from 1.28.14 to 1.30.5
2 parents 2c007a1 + 38e583f commit d02709c

File tree

3 files changed

+14
-9
lines changed

3 files changed

+14
-9
lines changed

docs/source/changelog.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ changes in pull requests], this list should be updated.
1414

1515
- 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)
1616
- 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)
17-
- user-scheduler: update to use kube-scheduler 1.28, from 1.26 [#3312](https://github.com/jupyterhub/zero-to-jupyterhub-k8s/pull/3312)
1817

1918
## 3.3
2019

jupyterhub/templates/scheduling/user-scheduler/rbac.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,10 @@ rules:
2222
# - unchanged between 1.22 and 1.27
2323
# - changed in 1.28: permissions to get/update lock endpoint resource
2424
# removed
25-
# - unchanged between 1.28 and 1.29
25+
# - unchanged between 1.28 and 1.30
26+
# - (1.31 is known to bring some changes below)
2627
#
27-
# ref: https://github.com/kubernetes/kubernetes/blob/v1.29.0/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/testdata/cluster-roles.yaml#L721-L862
28+
# ref: https://github.com/kubernetes/kubernetes/blob/v1.30.0/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/testdata/cluster-roles.yaml#L721-L862
2829
- apiGroups:
2930
- ""
3031
- events.k8s.io

jupyterhub/values.yaml

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -453,19 +453,24 @@ scheduling:
453453
#
454454
plugins:
455455
score:
456-
# These scoring plugins are enabled by default according to
457-
# https://kubernetes.io/docs/reference/scheduling/config/#scheduling-plugins
458-
# 2022-02-22.
456+
# We make use of the default scoring plugins, but we re-enable some with
457+
# a new priority, leave some enabled with their lower default priority,
458+
# and disable some.
459459
#
460-
# Enabled with high priority:
460+
# Below are the default scoring plugins as of 2024-09-23 according to
461+
# https://kubernetes.io/docs/reference/scheduling/config/#scheduling-plugins.
462+
#
463+
# Re-enabled with high priority:
461464
# - NodeAffinity
462465
# - InterPodAffinity
463466
# - NodeResourcesFit
464467
# - ImageLocality
468+
#
465469
# Remains enabled with low default priority:
466470
# - TaintToleration
467471
# - PodTopologySpread
468472
# - VolumeBinding
473+
#
469474
# Disabled for scoring:
470475
# - NodeResourcesBalancedAllocation
471476
#
@@ -494,12 +499,12 @@ scheduling:
494499
- name: NodeResourcesFit
495500
args:
496501
scoringStrategy:
502+
type: MostAllocated
497503
resources:
498504
- name: cpu
499505
weight: 1
500506
- name: memory
501507
weight: 1
502-
type: MostAllocated
503508
containerSecurityContext:
504509
runAsNonRoot: true
505510
runAsUser: 65534 # nobody user
@@ -545,7 +550,7 @@ scheduling:
545550
# here. We aim to stay around 1 minor version behind the latest k8s
546551
# version.
547552
#
548-
tag: "v1.28.14" # ref: https://github.com/kubernetes/kubernetes/tree/master/CHANGELOG
553+
tag: "v1.30.5" # ref: https://github.com/kubernetes/kubernetes/tree/master/CHANGELOG
549554
pullPolicy:
550555
pullSecrets: []
551556
nodeSelector: {}

0 commit comments

Comments
 (0)