Skip to content

Commit

Permalink
[issue-1227] extending scheduler patcher for Kubernetes 1.31 and above (
Browse files Browse the repository at this point in the history
  • Loading branch information
katarzynakulpa authored Sep 26, 2024
1 parent 8a5bb59 commit e765db6
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -234,13 +234,13 @@ jobs:
args: zip -qq -r reports.zip tests/e2e/reports

- name: Upload report to artifacts
uses: actions/upload-artifact@v2.2.1
uses: actions/upload-artifact@v4.4.0
with:
name: e2e_artifacts_archive
path: reports.zip

- name: Upload report to artifacts
uses: actions/upload-artifact@v2.2.1
uses: actions/upload-artifact@v4.4.0
with:
name: e2e_artifacts_log
path: tests/log.txt
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
run: make coverage

- name: Upload coverage report to artifacts
uses: actions/upload-artifact@v2.2.1
uses: actions/upload-artifact@v4.4.0
with:
name: coverage.html
path: ./coverage.html
Expand Down
6 changes: 3 additions & 3 deletions pkg/scheduler/patcher/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -122,11 +122,11 @@ def run():
path = args.target_config_29_path

log.info(f"Applying scheduler config: {path}")
# the option is still available for kubernetes 1.26, 1.27, 1.28, 1.29, 1.30
# verify if the option is still available for kubernetes greater than 1.30
# the option is still available for kubernetes 1.26, 1.27, 1.28, 1.29, 1.30, 1.31 and above
# verify if the option is still available for kubernetes greater than 1.31
# https://github.com/kubernetes/kubernetes/blob/c78812868f5f7a9c56c85f2e5c8b41265f3c1ce3/CHANGELOG/CHANGELOG-1.30.md?plain=1#L716
# https://github.com/kubernetes/kubernetes/issues/110175
config_unschedulable_pods = (kube_major_ver==1 and kube_minor_ver>23 and kube_minor_ver<=30)
config_unschedulable_pods = (kube_major_ver==1 and kube_minor_ver>23)

manifest = "/etc/kubernetes/manifests/kube-scheduler.yaml"
if args.platform == "rke":
Expand Down

0 comments on commit e765db6

Please sign in to comment.