Skip to content

Commit 4bdcd66

Browse files
saintubesaintube
authored
ci: fix scheduler e2e workflow after 1.28 upgradation (#2053)
Signed-off-by: saintube <[email protected]>
1 parent 44d8d1b commit 4bdcd66

File tree

6 files changed

+22
-11
lines changed

6 files changed

+22
-11
lines changed

‎.github/workflows/e2e-k8s-1.22.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,11 @@ jobs:
4343
docker build --pull . -t ${MANAGER_IMAGE} -f docker/koord-manager.dockerfile
4444
export KOORDLET_IMAGE="koordinator-sh/koordlet:e2e-${GITHUB_RUN_ID}"
4545
docker build --pull . -t ${KOORDLET_IMAGE} -f docker/koordlet.dockerfile
46+
export SCHEDULER_IMAGE="koordinator-sh/koord-scheduler:e2e-${GITHUB_RUN_ID}"
47+
docker build --pull . -t ${SCHEDULER_IMAGE} -f docker/koord-scheduler.dockerfile
4648
kind load docker-image --name=${KIND_CLUSTER_NAME} ${MANAGER_IMAGE} || { echo >&2 "kind not installed or error loading image: ${MANAGER_IMAGE}"; exit 1; }
4749
kind load docker-image --name=${KIND_CLUSTER_NAME} ${KOORDLET_IMAGE} || { echo >&2 "kind not installed or error loading image: ${KOORDLET_IMAGE}"; exit 1; }
50+
kind load docker-image --name=${KIND_CLUSTER_NAME} ${SCHEDULER_IMAGE} || { echo >&2 "kind not installed or error loading image: ${SCHEDULER_IMAGE}"; exit 1; }
4851
- name: Check host environment
4952
run: |
5053
set -ex
@@ -58,7 +61,7 @@ jobs:
5861
run: |
5962
set -ex
6063
kubectl cluster-info
61-
KUBERNETES_VERSION="1.22" MANAGER_IMG=koordinator-sh/koord-manager:e2e-${GITHUB_RUN_ID} KOORDLET_IMG=koordinator-sh/koordlet:e2e-${GITHUB_RUN_ID} ./hack/deploy_kind.sh
64+
KUBERNETES_VERSION="1.22" MANAGER_IMG=koordinator-sh/koord-manager:e2e-${GITHUB_RUN_ID} KOORDLET_IMG=koordinator-sh/koordlet:e2e-${GITHUB_RUN_ID} SCHEDULER_IMG=koordinator-sh/koord-scheduler:e2e-${GITHUB_RUN_ID} ./hack/deploy_kind.sh
6265
NODES=$(kubectl get node | wc -l)
6366
for ((i=1;i<10;i++));
6467
do

‎.github/workflows/e2e-k8s-1.24.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,11 @@ jobs:
4343
docker build --pull . -t ${MANAGER_IMAGE} -f docker/koord-manager.dockerfile
4444
export KOORDLET_IMAGE="koordinator-sh/koordlet:e2e-${GITHUB_RUN_ID}"
4545
docker build --pull . -t ${KOORDLET_IMAGE} -f docker/koordlet.dockerfile
46+
export SCHEDULER_IMAGE="koordinator-sh/koord-scheduler:e2e-${GITHUB_RUN_ID}"
47+
docker build --pull . -t ${SCHEDULER_IMAGE} -f docker/koord-scheduler.dockerfile
4648
kind load docker-image --name=${KIND_CLUSTER_NAME} ${MANAGER_IMAGE} || { echo >&2 "kind not installed or error loading image: ${MANAGER_IMAGE}"; exit 1; }
4749
kind load docker-image --name=${KIND_CLUSTER_NAME} ${KOORDLET_IMAGE} || { echo >&2 "kind not installed or error loading image: ${KOORDLET_IMAGE}"; exit 1; }
50+
kind load docker-image --name=${KIND_CLUSTER_NAME} ${SCHEDULER_IMAGE} || { echo >&2 "kind not installed or error loading image: ${SCHEDULER_IMAGE}"; exit 1; }
4851
- name: Check host environment
4952
run: |
5053
set -ex
@@ -58,7 +61,7 @@ jobs:
5861
run: |
5962
set -ex
6063
kubectl cluster-info
61-
MANAGER_IMG=koordinator-sh/koord-manager:e2e-${GITHUB_RUN_ID} KOORDLET_IMG=koordinator-sh/koordlet:e2e-${GITHUB_RUN_ID} ./hack/deploy_kind.sh
64+
MANAGER_IMG=koordinator-sh/koord-manager:e2e-${GITHUB_RUN_ID} KOORDLET_IMG=koordinator-sh/koordlet:e2e-${GITHUB_RUN_ID} SCHEDULER_IMG=koordinator-sh/koord-scheduler:e2e-${GITHUB_RUN_ID} ./hack/deploy_kind.sh
6265
NODES=$(kubectl get node | wc -l)
6366
for ((i=1;i<10;i++));
6467
do

‎.github/workflows/e2e-k8s-1.28.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,11 @@ jobs:
4343
docker build --pull . -t ${MANAGER_IMAGE} -f docker/koord-manager.dockerfile
4444
export KOORDLET_IMAGE="koordinator-sh/koordlet:e2e-${GITHUB_RUN_ID}"
4545
docker build --pull . -t ${KOORDLET_IMAGE} -f docker/koordlet.dockerfile
46+
export SCHEDULER_IMAGE="koordinator-sh/koord-scheduler:e2e-${GITHUB_RUN_ID}"
47+
docker build --pull . -t ${SCHEDULER_IMAGE} -f docker/koord-scheduler.dockerfile
4648
kind load docker-image --name=${KIND_CLUSTER_NAME} ${MANAGER_IMAGE} || { echo >&2 "kind not installed or error loading image: ${MANAGER_IMAGE}"; exit 1; }
4749
kind load docker-image --name=${KIND_CLUSTER_NAME} ${KOORDLET_IMAGE} || { echo >&2 "kind not installed or error loading image: ${KOORDLET_IMAGE}"; exit 1; }
50+
kind load docker-image --name=${KIND_CLUSTER_NAME} ${SCHEDULER_IMAGE} || { echo >&2 "kind not installed or error loading image: ${SCHEDULER_IMAGE}"; exit 1; }
4851
- name: Check host environment
4952
run: |
5053
set -ex
@@ -58,7 +61,7 @@ jobs:
5861
run: |
5962
set -ex
6063
kubectl cluster-info
61-
MANAGER_IMG=koordinator-sh/koord-manager:e2e-${GITHUB_RUN_ID} KOORDLET_IMG=koordinator-sh/koordlet:e2e-${GITHUB_RUN_ID} ./hack/deploy_kind.sh
64+
MANAGER_IMG=koordinator-sh/koord-manager:e2e-${GITHUB_RUN_ID} KOORDLET_IMG=koordinator-sh/koordlet:e2e-${GITHUB_RUN_ID} SCHEDULER_IMG=koordinator-sh/koord-scheduler:e2e-${GITHUB_RUN_ID} ./hack/deploy_kind.sh
6265
NODES=$(kubectl get node | wc -l)
6366
for ((i=1;i<10;i++));
6467
do

‎.github/workflows/e2e-k8s-latest.yaml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ on:
55
branches:
66
- main
77
- release-*
8-
pull_request: {}
8+
# For the latest version of the K8S, check it in the main branch and no need to run in each PR.
99
workflow_dispatch: {}
1010

1111
env:
1212
# Common versions
1313
GO_VERSION: '1.20'
1414
KIND_ACTION_VERSION: 'v1.5.0'
15-
KIND_VERSION: 'v0.20.0'
15+
KIND_VERSION: 'v0.22.0'
1616
KIND_CLUSTER_NAME: 'ci-testing'
1717
COMPONENT_NS: "koordinator-system"
1818

@@ -41,8 +41,11 @@ jobs:
4141
docker build --pull . -t ${MANAGER_IMAGE} -f docker/koord-manager.dockerfile
4242
export KOORDLET_IMAGE="koordinator-sh/koordlet:e2e-${GITHUB_RUN_ID}"
4343
docker build --pull . -t ${KOORDLET_IMAGE} -f docker/koordlet.dockerfile
44+
export SCHEDULER_IMAGE="koordinator-sh/koord-scheduler:e2e-${GITHUB_RUN_ID}"
45+
docker build --pull . -t ${SCHEDULER_IMAGE} -f docker/koord-scheduler.dockerfile
4446
kind load docker-image --name=${KIND_CLUSTER_NAME} ${MANAGER_IMAGE} || { echo >&2 "kind not installed or error loading image: ${MANAGER_IMAGE}"; exit 1; }
4547
kind load docker-image --name=${KIND_CLUSTER_NAME} ${KOORDLET_IMAGE} || { echo >&2 "kind not installed or error loading image: ${KOORDLET_IMAGE}"; exit 1; }
48+
kind load docker-image --name=${KIND_CLUSTER_NAME} ${SCHEDULER_IMAGE} || { echo >&2 "kind not installed or error loading image: ${SCHEDULER_IMAGE}"; exit 1; }
4649
- name: Check host environment
4750
run: |
4851
set -ex
@@ -56,7 +59,7 @@ jobs:
5659
run: |
5760
set -ex
5861
kubectl cluster-info
59-
MANAGER_IMG=koordinator-sh/koord-manager:e2e-${GITHUB_RUN_ID} KOORDLET_IMG=koordinator-sh/koordlet:e2e-${GITHUB_RUN_ID} ./hack/deploy_kind.sh
62+
MANAGER_IMG=koordinator-sh/koord-manager:e2e-${GITHUB_RUN_ID} KOORDLET_IMG=koordinator-sh/koordlet:e2e-${GITHUB_RUN_ID} SCHEDULER_IMG=koordinator-sh/koord-scheduler:e2e-${GITHUB_RUN_ID} ./hack/deploy_kind.sh
6063
NODES=$(kubectl get node | wc -l)
6164
for ((i=1;i<10;i++));
6265
do

‎config/manager/scheduler-config.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
namespace: system
66
data:
77
koord-scheduler-config: |
8-
apiVersion: kubescheduler.config.k8s.io/v1beta2
8+
apiVersion: kubescheduler.config.k8s.io/v1beta3
99
kind: KubeSchedulerConfiguration
1010
leaderElection:
1111
leaderElect: true
@@ -16,7 +16,7 @@ data:
1616
- pluginConfig:
1717
- name: NodeResourcesFit
1818
args:
19-
apiVersion: kubescheduler.config.k8s.io/v1beta2
19+
apiVersion: kubescheduler.config.k8s.io/v1beta3
2020
kind: NodeResourcesFitArgs
2121
scoringStrategy:
2222
type: LeastAllocated
@@ -31,7 +31,7 @@ data:
3131
weight: 1
3232
- name: LoadAwareScheduling
3333
args:
34-
apiVersion: kubescheduler.config.k8s.io/v1beta2
34+
apiVersion: kubescheduler.config.k8s.io/v1beta3
3535
kind: LoadAwareSchedulingArgs
3636
filterExpiredNodeMetrics: false
3737
nodeMetricExpirationSeconds: 300
@@ -46,7 +46,7 @@ data:
4646
memory: 70
4747
- name: ElasticQuota
4848
args:
49-
apiVersion: kubescheduler.config.k8s.io/v1beta2
49+
apiVersion: kubescheduler.config.k8s.io/v1beta3
5050
kind: ElasticQuotaArgs
5151
quotaGroupNamespace: koordinator-system
5252
plugins:

‎config/manager/scheduler.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ spec:
3535
containers:
3636
- args:
3737
- --port=10251
38-
- --logtostderr=true
3938
- --authentication-skip-lookup=true
4039
- --v=4
4140
- --feature-gates=

0 commit comments

Comments
 (0)