From 41f1f69d7ddb48fc0e2bb4facd9ffb91bc3a3987 Mon Sep 17 00:00:00 2001 From: Katarzyna kulpa Date: Wed, 25 Sep 2024 15:06:11 +0200 Subject: [PATCH 1/2] [issue-1227] extending scheduler patcher for kubernetes 1.31 and above Signed-off-by: Katarzyna kulpa --- pkg/scheduler/patcher/main.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/scheduler/patcher/main.py b/pkg/scheduler/patcher/main.py index 8a6d2bc58..aac4e49fd 100644 --- a/pkg/scheduler/patcher/main.py +++ b/pkg/scheduler/patcher/main.py @@ -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": From ee2f29ef827cb5505effe188b5289d570a32ed1e Mon Sep 17 00:00:00 2001 From: Katarzyna kulpa Date: Wed, 25 Sep 2024 15:23:42 +0200 Subject: [PATCH 2/2] issue-1227 Signed-off-by: Katarzyna kulpa --- .github/workflows/e2e.yml | 4 ++-- .github/workflows/pr.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 4c8171edb..57aff634a 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -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 diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 7e063a063..048f513dd 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -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